diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
index 9ac6ab9eb620ccd265a61ab55c28f1aa811289ab..6e6d8870d09e37e1ffa6273fb85d7aaa45009ec5 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptorManager.java
@@ -17,6 +17,7 @@
  */
 package org.jkiss.dbeaver.registry;
 
+import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.DBeaverUI;
@@ -88,16 +89,23 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
             dataSource.setName(newName);
             registry.addDataSource(dataSource);
         } else {
-            DataSourceRegistry registry;
+            final DataSourceRegistry registry;
             if (parent != null) {
                 registry = parent;
             } else {
                 registry = DBeaverCore.getInstance().getProjectRegistry().getActiveDataSourceRegistry();
             }
-            CreateConnectionDialog dialog = new CreateConnectionDialog(
-                DBeaverUI.getActiveWorkbenchWindow(),
-                new NewConnectionWizard(registry));
-            dialog.open();
+
+            final IWorkbenchWindow window = DBeaverUI.getActiveWorkbenchWindow();
+            window.getShell().getDisplay().asyncExec(new Runnable() {
+                @Override
+                public void run() {
+                    CreateConnectionDialog dialog = new CreateConnectionDialog(
+                        window,
+                        new NewConnectionWizard(registry));
+                    dialog.open();
+                }
+            });
         }
         return null;
     }