diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp
index ef30250c24..766b9ffe32 100644
--- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp
+++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp
@@ -1,304 +1,312 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkXnatConnectionPreferencePage.h"
 
 #include "org_mitk_gui_qt_xnatinterface_Activator.h"
 
 #include "berryIPreferencesService.h"
 #include "berryPlatform.h"
 
+#include <QFileDialog>
 #include <QLabel>
 #include <QPushButton>
 #include <QLineEdit>
 #include <QGridLayout>
 #include <QMessageBox>
 #include <QApplication>
 #include <QMap>
 
 #include "ctkXnatSession.h"
 #include "ctkXnatLoginProfile.h"
 #include "ctkXnatException.h"
 
 #include <mitkIOUtil.h>
 
 using namespace berry;
 
 QmitkXnatConnectionPreferencePage::QmitkXnatConnectionPreferencePage()
   : m_Control(0)
 {
 }
 
 void QmitkXnatConnectionPreferencePage::Init(berry::IWorkbench::Pointer)
 {
 }
 
 void QmitkXnatConnectionPreferencePage::CreateQtControl(QWidget* parent)
 {
   IPreferencesService* prefService = Platform::GetPreferencesService();
   berry::IPreferences::Pointer _XnatConnectionPreferencesNode = prefService->GetSystemPreferences()->Node("/XnatConnection");
   m_XnatConnectionPreferencesNode = _XnatConnectionPreferencesNode;
 
   m_Controls.setupUi(parent);
   m_Control = new QWidget(parent);
   m_Control->setLayout(m_Controls.gridLayout);
 
   ctkXnatSession* session;
 
   try
   {
     session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService(
       mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference<ctkXnatSession>());
   }
   catch (std::invalid_argument)
   {
     session = nullptr;
   }
 
   if (session != nullptr)
   {
     if (session->isOpen())
     {
       m_Controls.xnatTestConnectionButton->setText("Disconnect");
     }
     else
     {
       m_Controls.xnatTestConnectionButton->setText("Connect");
     }
   }
 
   const QIntValidator *portV = new QIntValidator(0, 65535, parent);
   m_Controls.inXnatPort->setValidator(portV);
 
   const QRegExp hostRx("^(https?)://[^ /](\\S)+$");
   const QRegExpValidator *hostV = new QRegExpValidator(hostRx, parent);
   m_Controls.inXnatHostAddress->setValidator(hostV);
 
   connect(m_Controls.xnatTestConnectionButton, SIGNAL(clicked()), this, SLOT(ToggleConnection()));
 
   connect(m_Controls.inXnatHostAddress, SIGNAL(editingFinished()), this, SLOT(UrlChanged()));
   connect(m_Controls.inXnatDownloadPath, SIGNAL(editingFinished()), this, SLOT(DownloadPathChanged()));
 
   connect(m_Controls.cbUseNetworkProxy, SIGNAL(toggled(bool)), this, SLOT(onUseNetworkProxy(bool)));
 
+  connect(m_Controls.btnDownloadPath, SIGNAL(clicked()), this, SLOT(OnDownloadPathButtonClicked()));
+
   m_Controls.groupBoxProxySettings->setVisible(m_Controls.cbUseNetworkProxy->isChecked());
 
   this->Update();
 }
 
 QWidget* QmitkXnatConnectionPreferencePage::GetQtControl() const
 {
   return m_Control;
 }
 
 bool QmitkXnatConnectionPreferencePage::PerformOk()
 {
   if (!UserInformationEmpty())
   {
     IPreferences::Pointer _XnatConnectionPreferencesNode = m_XnatConnectionPreferencesNode.Lock();
     if (_XnatConnectionPreferencesNode.IsNotNull())
     {
       _XnatConnectionPreferencesNode->Put(m_Controls.xnatHostAddressLabel->text(), m_Controls.inXnatHostAddress->text());
       _XnatConnectionPreferencesNode->Put(m_Controls.xnatPortLabel->text(), m_Controls.inXnatPort->text());
       _XnatConnectionPreferencesNode->Put(m_Controls.xnatUsernameLabel->text(), m_Controls.inXnatUsername->text());
       _XnatConnectionPreferencesNode->Put(m_Controls.xnatPasswortLabel->text(), m_Controls.inXnatPassword->text());
       _XnatConnectionPreferencesNode->Put(m_Controls.xnatDownloadPathLabel->text(), m_Controls.inXnatDownloadPath->text());
 
       // Network proxy settings
       _XnatConnectionPreferencesNode->PutBool(m_Controls.cbUseNetworkProxy->text(), m_Controls.cbUseNetworkProxy->isChecked());
       _XnatConnectionPreferencesNode->Put(m_Controls.proxyAddressLabel->text(), m_Controls.inProxyAddress->text());
       _XnatConnectionPreferencesNode->Put(m_Controls.proxyPortLabel->text(), m_Controls.inProxyPort->text());
       _XnatConnectionPreferencesNode->Put(m_Controls.proxyUsernameLabel->text(), m_Controls.inProxyUsername->text());
       _XnatConnectionPreferencesNode->Put(m_Controls.proxyPasswordLabel->text(), m_Controls.inProxyPassword->text());
       _XnatConnectionPreferencesNode->Flush();
 
       return true;
     }
   }
   else
   {
     QMessageBox::critical(QApplication::activeWindow(), "Saving Preferences failed",
       "The connection parameters in XNAT Preferences were empty.\nPlease use the 'Connect' button to validate the connection parameters.");
   }
   return false;
 }
 
 void QmitkXnatConnectionPreferencePage::PerformCancel()
 {
 }
 
 bool QmitkXnatConnectionPreferencePage::UserInformationEmpty()
 {
   // To check empty QLineEdits in the following
   QString errString;
 
   if (m_Controls.inXnatHostAddress->text().isEmpty())
   {
     errString += "Server Address is empty.\n";
   }
 
   if (m_Controls.inXnatUsername->text().isEmpty())
   {
     errString += "Username is empty.\n";
   }
 
   if (m_Controls.inXnatPassword->text().isEmpty())
   {
     errString += "Password is empty.\n";
   }
 
   // if something is empty
   if (!errString.isEmpty())
   {
     m_Controls.xnatTestConnectionLabel->setStyleSheet("QLabel { color: red; }");
     m_Controls.xnatTestConnectionLabel->setText("Connecting failed.\n" + errString);
     return true;
   }
   else
   {
     return false;
   }
 }
 
 void QmitkXnatConnectionPreferencePage::Update()
 {
   IPreferences::Pointer _XnatConnectionPreferencesNode = m_XnatConnectionPreferencesNode.Lock();
   if (_XnatConnectionPreferencesNode.IsNotNull())
   {
     m_Controls.inXnatHostAddress->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.xnatHostAddressLabel->text(), m_Controls.inXnatHostAddress->text()));
     m_Controls.inXnatPort->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.xnatPortLabel->text(), m_Controls.inXnatPort->text()));
     m_Controls.inXnatUsername->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.xnatUsernameLabel->text(), m_Controls.inXnatUsername->text()));
     m_Controls.inXnatPassword->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.xnatPasswortLabel->text(), m_Controls.inXnatPassword->text()));
     m_Controls.inXnatDownloadPath->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.xnatDownloadPathLabel->text(), m_Controls.inXnatDownloadPath->text()));
 
     // Network proxy settings
     m_Controls.cbUseNetworkProxy->setChecked(_XnatConnectionPreferencesNode->GetBool(
                                              m_Controls.cbUseNetworkProxy->text(), false));
     m_Controls.inProxyAddress->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.proxyAddressLabel->text(), m_Controls.inProxyAddress->text()));
     m_Controls.inProxyPort->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.proxyPortLabel->text(), m_Controls.inProxyPort->text()));
     m_Controls.inProxyUsername->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.proxyUsernameLabel->text(), m_Controls.inProxyUsername->text()));
     m_Controls.inProxyPassword->setText(_XnatConnectionPreferencesNode->Get(
       m_Controls.proxyPasswordLabel->text(), m_Controls.inProxyPassword->text()));
   }
 }
 
 void QmitkXnatConnectionPreferencePage::UrlChanged()
 {
   m_Controls.inXnatHostAddress->setStyleSheet("QLineEdit { background-color: white; }");
   QString str = m_Controls.inXnatHostAddress->text();
 
   while (str.endsWith("/"))
   {
     str = str.left(str.length() - 1);
   }
 
   m_Controls.inXnatHostAddress->setText(str);
 
   QUrl url(m_Controls.inXnatHostAddress->text());
   if (!url.isValid())
   {
     m_Controls.inXnatHostAddress->setStyleSheet("QLineEdit { background-color: red; }");
   }
 }
 
 void QmitkXnatConnectionPreferencePage::DownloadPathChanged()
 {
   m_Controls.inXnatDownloadPath->setStyleSheet("QLineEdit { background-color: white; }");
   QString downloadPath = m_Controls.inXnatDownloadPath->text();
   if (!downloadPath.isEmpty())
   {
     if (downloadPath.lastIndexOf("/") != downloadPath.size() - 1)
     {
       downloadPath.append("/");
       m_Controls.inXnatDownloadPath->setText(downloadPath);
     }
     QFileInfo path(m_Controls.inXnatDownloadPath->text());
     if (!path.isDir())
     {
       m_Controls.inXnatDownloadPath->setStyleSheet("QLineEdit { background-color: red; }");
     }
   }
 }
 
 void QmitkXnatConnectionPreferencePage::onUseNetworkProxy(bool status)
 {
   m_Controls.groupBoxProxySettings->setVisible(status);
 }
 
+void QmitkXnatConnectionPreferencePage::OnDownloadPathButtonClicked()
+{
+  m_Controls.inXnatDownloadPath->setText(QFileDialog::getExistingDirectory());
+}
+
 void QmitkXnatConnectionPreferencePage::ToggleConnection()
 {
   ctkXnatSession* session = 0;
 
   try
   {
     session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService(
       mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference<ctkXnatSession>());
   }
   catch (std::invalid_argument)
   {
     if (!UserInformationEmpty())
     {
       PerformOk();
 
       mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->CreateXnatSession();
       session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService(
         mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference<ctkXnatSession>());
     }
   }
 
   if (session != 0 && session->isOpen())
   {
     mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->CloseXnatSession();
     m_Controls.xnatTestConnectionButton->setText("Connect");
     m_Controls.xnatTestConnectionLabel->clear();
   }
   else if (session != 0 && !session->isOpen())
   {
     m_Controls.xnatTestConnectionButton->setEnabled(false);
 
     try
     {
       mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->OpenXnatSession();
 
       m_Controls.xnatTestConnectionButton->setText("Disconnect");
       m_Controls.xnatTestConnectionLabel->setStyleSheet("QLabel { color: green; }");
       m_Controls.xnatTestConnectionLabel->setText("Connecting successful.");
     }
     catch (const ctkXnatAuthenticationException& auth)
     {
       m_Controls.xnatTestConnectionLabel->setStyleSheet("QLabel { color: red; }");
       m_Controls.xnatTestConnectionLabel->setText("Connecting failed:\nAuthentication error.");
       MITK_INFO << auth.message().toStdString();
       mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->CloseXnatSession();
     }
     catch (const ctkException& e)
     {
       m_Controls.xnatTestConnectionLabel->setStyleSheet("QLabel { color: red; }");
       m_Controls.xnatTestConnectionLabel->setText("Connecting failed:\nInvalid Server Adress");
       MITK_INFO << e.message().toStdString();
       mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatSessionManager()->CloseXnatSession();
     }
     m_Controls.xnatTestConnectionButton->setEnabled(true);
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.h b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.h
index 53ae33884b..5b2feb14e8 100644
--- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.h
+++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.h
@@ -1,86 +1,87 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef QMITKXNATCONNECTIONPREFERENCEPAGE_H_
 #define QMITKXNATCONNECTIONPREFERENCEPAGE_H_
 
 #include "berryIQtPreferencePage.h"
 #include <berryIPreferences.h>
 
 #include "ui_QmitkXnatConnectionPreferencePageControls.h"
 
 class QWidget;
 class QLineEdit;
 
 struct QmitkXnatConnectionPreferencePage : public QObject, public berry::IQtPreferencePage
 {
   Q_OBJECT
   Q_INTERFACES(berry::IPreferencePage)
 
 public:
   QmitkXnatConnectionPreferencePage();
 
   void Init(berry::IWorkbench::Pointer workbench) override;
 
   void CreateQtControl(QWidget* widget) override;
 
   QWidget* GetQtControl() const override;
 
   ///
   /// \see IPreferencePage::PerformOk()
   ///
   virtual bool PerformOk() override;
 
   ///
   /// \see IPreferencePage::PerformCancel()
   ///
   virtual void PerformCancel() override;
 
   ///
   /// \see IPreferencePage::Update()
   ///
   virtual void Update() override;
 
   protected slots:
     virtual void UrlChanged();
     virtual void DownloadPathChanged();
+  void OnDownloadPathButtonClicked();
 
     ///
     /// Toggles the Connection in the Service Registry from opened to closed or the other way around.
     ///
     virtual void ToggleConnection();
 
   virtual void onUseNetworkProxy(bool);
 
 protected:
 
   Ui::QmitkXnatConnectionPreferencePageControls m_Controls;
 
   QWidget* m_Control;
 
   berry::IPreferences::WeakPtr m_XnatConnectionPreferencesNode;
 
 private:
 
   ///
   /// Checks if the entered user information is empty.
   ///
   virtual bool UserInformationEmpty();
 
 };
 
 #endif /* QMITKXNATCONNECTIONPREFERENCEPAGE_H_ */
diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePageControls.ui b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePageControls.ui
index e1d90a0961..92edcda670 100644
--- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePageControls.ui
+++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePageControls.ui
@@ -1,255 +1,262 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkXnatConnectionPreferencePageControls</class>
  <widget class="QWidget" name="QmitkXnatConnectionPreferencePageControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>742</width>
     <height>349</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>653</width>
     <height>116</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>16777215</width>
     <height>16777215</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="1">
     <widget class="QCheckBox" name="cbUseNetworkProxy">
      <property name="text">
       <string>Use Network Proxy</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QGroupBox" name="groupBoxXnatSettings">
      <property name="title">
       <string>XNAT Connection Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="xnatHostAddressLabel">
         <property name="text">
          <string>Server Address</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="inXnatHostAddress">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Examples:&lt;/p&gt;&lt;p&gt;https://central.xnat.org&lt;br/&gt;http://localhost/xnat&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="placeholderText">
          <string>http(s)://</string>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="QLabel" name="xnatPortLabel">
         <property name="text">
          <string>Port</string>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="QLineEdit" name="inXnatPort">
         <property name="maximumSize">
          <size>
           <width>50</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>Standard-Port: 80</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="xnatUsernameLabel">
         <property name="text">
          <string>Username</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="inXnatUsername">
         <property name="placeholderText">
          <string>testuser</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="xnatPasswortLabel">
         <property name="text">
          <string>Password</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLineEdit" name="inXnatPassword">
         <property name="echoMode">
          <enum>QLineEdit::Password</enum>
         </property>
         <property name="placeholderText">
          <string>testpassword</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="xnatDownloadPathLabel">
         <property name="text">
          <string>Download Path</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QLineEdit" name="inXnatDownloadPath"/>
       </item>
       <item row="4" column="0">
        <widget class="QPushButton" name="xnatTestConnectionButton">
         <property name="text">
          <string>Connect</string>
         </property>
        </widget>
       </item>
       <item row="5" column="0" colspan="2">
        <widget class="QLabel" name="xnatTestConnectionLabel">
         <property name="layoutDirection">
          <enum>Qt::LeftToRight</enum>
         </property>
         <property name="lineWidth">
          <number>1</number>
         </property>
         <property name="text">
          <string/>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
         </property>
        </widget>
       </item>
+      <item row="3" column="2">
+       <widget class="QToolButton" name="btnDownloadPath">
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
    <item row="3" column="1">
     <widget class="QGroupBox" name="groupBoxProxySettings">
      <property name="title">
       <string>Network Proxy Settings</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="1" column="3">
        <widget class="QLineEdit" name="inProxyPort">
         <property name="maximumSize">
          <size>
           <width>50</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>Standard-Port: 80</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="proxyPasswordLabel">
         <property name="text">
          <string>Proxy Password</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="proxyUsernameLabel">
         <property name="text">
          <string>Proxy Username</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="inProxyAddress">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Examples:&lt;/p&gt;&lt;p&gt;https://central.xnat.org&lt;br/&gt;http://localhost/xnat&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="placeholderText">
          <string>http(s)://</string>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="QLabel" name="proxyPortLabel">
         <property name="text">
          <string>Proxy Port</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QLineEdit" name="inProxyPassword">
         <property name="echoMode">
          <enum>QLineEdit::Password</enum>
         </property>
         <property name="placeholderText">
          <string>testpassword</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLineEdit" name="inProxyUsername">
         <property name="placeholderText">
          <string>testuser</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="proxyAddressLabel">
         <property name="text">
          <string>Proxy Server Address</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item row="4" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>