diff --git a/Modules/DICOMUI/src/QmitkDicomExternalDataWidget.cpp b/Modules/DICOMUI/src/QmitkDicomExternalDataWidget.cpp
index 414ecfb82b..1c9090cd4e 100644
--- a/Modules/DICOMUI/src/QmitkDicomExternalDataWidget.cpp
+++ b/Modules/DICOMUI/src/QmitkDicomExternalDataWidget.cpp
@@ -1,230 +1,230 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 // Qmitk
 #include "QmitkDicomExternalDataWidget.h"
 #include <mitkLogMacros.h>
 
 // CTK
 #include <ctkDICOMIndexer.h>
 #include <ctkFileDialog.h>
 
 // Qt
 #include <QCheckBox>
 #include <QMessageBox>
 #include <QTemporaryFile>
 
 const std::string QmitkDicomExternalDataWidget::Widget_ID = "org.mitk.Widgets.QmitkDicomExternalDataWidget";
 
 QmitkDicomExternalDataWidget::QmitkDicomExternalDataWidget(QWidget *parent)
   : QWidget(parent), m_ProgressDialog(nullptr), m_Controls(nullptr)
 {
   Initialize();
   CreateQtPartControl(this);
 }
 
 QmitkDicomExternalDataWidget::~QmitkDicomExternalDataWidget()
 {
 }
 
 void QmitkDicomExternalDataWidget::CreateQtPartControl(QWidget *parent)
 {
   // build up qt Widget, unless already done
   if (!m_Controls)
   {
     // create GUI widgets from the Qt Designer's .ui file
     m_Controls = new Ui::QmitkDicomExternalDataWidgetControls;
     m_Controls->setupUi(parent);
     m_Controls->viewExternalDataButton->setVisible(true);
     m_Controls->ctkDICOMBrowser->setTableOrientation(Qt::Vertical);
     m_Controls->ctkDICOMBrowser->setDICOMDatabase(m_ExternalDatabase);
 
     SetupImportDialog();
     SetupProgressDialog();
 
     // connect buttons
     connect(m_Controls->downloadButton, SIGNAL(clicked()), this, SLOT(OnDownloadButtonClicked()));
     connect(m_Controls->viewExternalDataButton, SIGNAL(clicked()), this, SLOT(OnViewButtonClicked()));
     connect(m_Controls->directoryButton, SIGNAL(clicked()), m_ImportDialog, SLOT(show()));
 
     connect(m_Controls->ctkDICOMBrowser,
             SIGNAL(seriesSelectionChanged(const QStringList &)),
             this,
             SLOT(OnSeriesSelectionChanged(const QStringList &)));
     connect(
       m_Controls->ctkDICOMBrowser, SIGNAL(seriesDoubleClicked(const QModelIndex &)), this, SLOT(OnViewButtonClicked()));
 
     connect(m_ImportDialog, SIGNAL(fileSelected(QString)), this, SLOT(OnStartDicomImport(QString)));
 
     connect(m_ExternalIndexer,
       SIGNAL(progressStep(QString)),
       this,
       SLOT(OnProgressStep(const QString&)));
     connect(m_ExternalIndexer,
             SIGNAL(progressDetail(QString)),
             this,
             SLOT(OnProgressDetail(const QString &)));
     connect(m_ExternalIndexer, SIGNAL(progress(int)), m_ProgressDialog, SLOT(setValue(int)));
     // actually the progress dialog closes if the maximum value is reached, BUT
     // the following line is needed since the external indexer wont reach maximum value (100 % progress)
     connect(m_ExternalIndexer, SIGNAL(indexingComplete(int, int, int, int)), m_ProgressDialog, SLOT(close()));
     connect(m_ProgressDialog, SIGNAL(canceled()), m_ExternalIndexer, SLOT(cancel()));
   }
 }
 
 void QmitkDicomExternalDataWidget::Initialize()
 {
   m_ExternalDatabase = new ctkDICOMDatabase(this);
 
   try
   {
     // this used to be an in-memory database, but latest CTK enhancements made it difficult
     // to maintain this mechanism
     QTemporaryFile tmpDatabaseFile;
     tmpDatabaseFile.open();
     tmpDatabaseFile.setAutoRemove(false);
     m_ExternalDatabase->openDatabase(tmpDatabaseFile.fileName(), QString("EXTERNAL-DB"));
   }
   catch (const std::exception&)
   {
     MITK_ERROR << "Database error: " << m_ExternalDatabase->lastError().toStdString();
     m_ExternalDatabase->closeDatabase();
     return;
   }
 
   m_ExternalIndexer = new ctkDICOMIndexer(this);
 }
 
 void QmitkDicomExternalDataWidget::OnDownloadButtonClicked()
 {
   QStringList filesToDownload = GetFileNamesFromIndex();
   if (filesToDownload.size() == 0)
   {
     QMessageBox info;
     info.setText("You have to select an entry in the DICOM browser for import.");
     info.exec();
     return;
   }
   emit SignalStartDicomImport(GetFileNamesFromIndex());
 }
 
 void QmitkDicomExternalDataWidget::OnViewButtonClicked()
 {
   QStringList uids = m_Controls->ctkDICOMBrowser->currentSeriesSelection();
   QString uid;
   foreach (uid, uids)
   {
     QStringList filesForSeries = m_ExternalDatabase->filesForSeries(uid);
     QHash<QString, QVariant> eventProperty;
     eventProperty.insert("FilesForSeries", filesForSeries);
     if (!filesForSeries.isEmpty())
     {
       QString modality = m_ExternalDatabase->fileValue(filesForSeries.at(0), "0008,0060");
       eventProperty.insert("Modality", modality);
     }
     emit SignalDicomToDataManager(eventProperty);
   }
 }
 
 void QmitkDicomExternalDataWidget::OnProgressStep(const QString& step)
 {
   m_ProgressStep = step;
   m_ProgressDialog->setLabelText(step);
 }
 
 void QmitkDicomExternalDataWidget::OnProgressDetail(const QString& detail)
 {
   m_ProgressDialog->setLabelText(m_ProgressStep+"\n"+detail);
 }
 
 QStringList QmitkDicomExternalDataWidget::GetFileNamesFromIndex()
 {
   QStringList filePaths;
 
   QString uid;
   QStringList seriesUIDs = m_Controls->ctkDICOMBrowser->currentSeriesSelection();
   foreach (uid, seriesUIDs)
   {
     filePaths.append(m_ExternalDatabase->filesForSeries(uid));
   }
   if (!filePaths.empty())
     return filePaths;
 
   QStringList studyUIDs = m_Controls->ctkDICOMBrowser->currentStudiesSelection();
 
   foreach (uid, studyUIDs)
   {
     seriesUIDs = m_ExternalDatabase->seriesForStudy(uid);
     foreach (uid, seriesUIDs)
     {
       filePaths.append(m_ExternalDatabase->filesForSeries(uid));
     }
   }
   if (!filePaths.empty())
     return filePaths;
 
   QStringList patientsUIDs = m_Controls->ctkDICOMBrowser->currentPatientsSelection();
 
   foreach (uid, patientsUIDs)
   {
     studyUIDs = m_ExternalDatabase->studiesForPatient(uid);
 
     foreach (uid, studyUIDs)
     {
       seriesUIDs = m_ExternalDatabase->seriesForStudy(uid);
       foreach (uid, seriesUIDs)
       {
         filePaths.append(m_ExternalDatabase->filesForSeries(uid));
       }
     }
   }
   return filePaths;
 }
 
 void QmitkDicomExternalDataWidget::OnStartDicomImport(const QString &directory)
 {
   m_ImportDialog->close();
   // no need to show / start the progress dialog, as the dialog
   // appears by receiving the progress signal from the external indexer
 
   m_LastImportDirectory = directory;
   m_ExternalIndexer->addDirectory(m_ExternalDatabase, m_LastImportDirectory);
 }
 
 void QmitkDicomExternalDataWidget::OnSeriesSelectionChanged(const QStringList &s)
 {
   m_Controls->viewExternalDataButton->setEnabled((s.size() != 0));
 }
 
 void QmitkDicomExternalDataWidget::SetupImportDialog()
 {
   // Initialize import widget
   m_ImportDialog = new ctkFileDialog(this);
   // Since copy on import is not working at the moment
   // this feature is disabled
   // QCheckBox* importCheckbox = new QCheckBox("Copy on import", m_ImportDialog);
   // m_ImportDialog->setBottomWidget(importCheckbox);
   m_ImportDialog->setFileMode(QFileDialog::Directory);
   m_ImportDialog->setLabelText(QFileDialog::Accept, "Import");
   m_ImportDialog->setWindowTitle("Import DICOM files from directory");
-  m_ImportDialog->setWindowModality(Qt::ApplicationModal);
+  m_ImportDialog->setWindowModality(Qt::WindowModal);
 }
 
 void QmitkDicomExternalDataWidget::SetupProgressDialog()
 {
   m_ProgressDialog = new QProgressDialog("Initialization ...", "Cancel", 0, 100, this);
   m_ProgressDialog->setWindowTitle("DICOM Import");
-  m_ProgressDialog->setWindowModality(Qt::ApplicationModal);
+  m_ProgressDialog->setWindowModality(Qt::WindowModal);
   m_ProgressDialog->setMinimumDuration(0);
   // FIX T20008: immediately set the progress dialog value to maximum --> will close the dialog
   m_ProgressDialog->setValue(100);
 }