diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index f06fe01e37d..300790fe130 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -488,7 +488,11 @@ QWidget *ICore::mainWindow()
 QWidget *ICore::dialogParent()
 {
     QWidget *active = QApplication::activeModalWidget();
-    return active ? active : m_mainwindow;
+    if (!active)
+        active = QApplication::activeWindow();
+    if (!active)
+        active = m_mainwindow;
+    return active;
 }
 
 QStatusBar *ICore::statusBar()