diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBENestedEditorProvider.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBENestedEditorProvider.java
deleted file mode 100644
index 357f8a4de5219a29da8673c3b444d4a30fdb07e1..0000000000000000000000000000000000000000
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBENestedEditorProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2015 Serge Rieder (serge@jkiss.org)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License (version 2)
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jkiss.dbeaver.model.edit;
-
-import org.eclipse.ui.IWorkbenchWindow;
-import org.jkiss.dbeaver.ui.editors.IDatabaseEditor;
-import org.jkiss.dbeaver.model.struct.DBSObject;
-
-/**
- * DBENestedEditorProvider
- */
-public interface DBENestedEditorProvider<OBJECT_TYPE extends DBSObject> extends DBEObjectManager<OBJECT_TYPE> {
-
-    /**
-     * Get tab descriptors for particular object.
-     *
-     * @param workbenchWindow workbench window
-     * @param superEditor main editor */
-    IDatabaseEditor[] getNestedEditors(
-        IWorkbenchWindow workbenchWindow,
-        IDatabaseEditor superEditor);
-
-}
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEObjectMaker.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEObjectMaker.java
index 6506273fa8c20411173da77f61cb011324349cd9..3c338d5aac9f862c47647ec67a933a08f24e9696 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEObjectMaker.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEObjectMaker.java
@@ -18,7 +18,6 @@
 
 package org.jkiss.dbeaver.model.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.impl.DBSObjectCache;
 import org.jkiss.dbeaver.model.struct.DBSObject;
@@ -55,13 +54,10 @@ public interface DBEObjectMaker<OBJECT_TYPE extends DBSObject, CONTAINER_TYPE> e
      * Real object creation will be performed by saveChanges function.
      * Additionally implementation could add initial command(s) to this manager.
      * This function can be invoked only once per one manager.
-     *
-     * @param workbenchWindow workbench window
      * @param commandContext command context
      * @param parent parent object
-     * @param copyFrom template for new object (usually result of "paste" operation)    @return null if no additional actions should be performed   */
+     * @param copyFrom template for new object (usually result of "paste" operation)    @return null if no additional actions should be performed     */
     OBJECT_TYPE createNewObject(
-        IWorkbenchWindow workbenchWindow,
         DBECommandContext commandContext,
         CONTAINER_TYPE parent,
         Object copyFrom);
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEPrivateObjectEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEPrivateObjectEditor.java
index 021797de3966d066a684646b91b448e9a0a5b3e7..2f6b316fb426969b9d6941f94f8ee277ca64fb85 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEPrivateObjectEditor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/edit/DBEPrivateObjectEditor.java
@@ -18,8 +18,6 @@
 
 package org.jkiss.dbeaver.model.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
-
 /**
  * Private editor.
  * Doesn't participates in common object edit framework. All object's modifications are done
@@ -27,6 +25,6 @@ import org.eclipse.ui.IWorkbenchWindow;
  */
 public interface DBEPrivateObjectEditor {
 
-    void editObject(IWorkbenchWindow workbenchWindow);
+    void editObject();
 
 }
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/AbstractResourceHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/AbstractResourceHandler.java
index 45e8bce6e15882c4b9b7d824b42a139b0c20aca7..3f3e68fc7ca3ab1a9be59a95e037f336faf77c33 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/AbstractResourceHandler.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/AbstractResourceHandler.java
@@ -20,7 +20,6 @@ package org.jkiss.dbeaver.model.impl.resources;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
@@ -54,7 +53,7 @@ public abstract class AbstractResourceHandler implements DBPResourceHandler {
     }
 
     @Override
-    public void openResource(IResource resource, IWorkbenchWindow window) throws CoreException, DBException
+    public void openResource(IResource resource) throws CoreException, DBException
     {
         //throw new DBException("Resource open is not implemented");
     }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/DefaultResourceHandlerImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/DefaultResourceHandlerImpl.java
index aac679cb80bd55d037d9f1b2541346cd7a0bbe40..21ddb293e094d4edb57d39850b32f642550415ae 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/DefaultResourceHandlerImpl.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/DefaultResourceHandlerImpl.java
@@ -20,7 +20,6 @@ package org.jkiss.dbeaver.model.impl.resources;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.navigator.DBNResource;
@@ -71,7 +70,7 @@ public class DefaultResourceHandlerImpl extends AbstractResourceHandler {
     }
 
     @Override
-    public void openResource(IResource resource, IWorkbenchWindow window) throws CoreException, DBException
+    public void openResource(IResource resource) throws CoreException, DBException
     {
         if (resource instanceof IFile) {
             RuntimeUtils.launchProgram(resource.getLocation().toFile().getAbsolutePath());
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ProjectHandlerImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ProjectHandlerImpl.java
index 9bfd6d0a525c0ea6fb76504185bcb1b2a0e340db..9388d6c04798522412fc61d7c68060df0e6151d9 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ProjectHandlerImpl.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ProjectHandlerImpl.java
@@ -20,7 +20,6 @@ package org.jkiss.dbeaver.model.impl.resources;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
@@ -53,7 +52,7 @@ public class ProjectHandlerImpl extends AbstractResourceHandler {
     }
 
     @Override
-    public void openResource(IResource resource, IWorkbenchWindow window) throws CoreException, DBException
+    public void openResource(IResource resource) throws CoreException, DBException
     {
         // do nothing
     }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java
index bda55693de5c17c4f2d0f32affdd929e4cef656c..8a8856a0b97948d438a5b038e027b0f5089a41ea 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java
@@ -17,13 +17,13 @@
  */
 package org.jkiss.dbeaver.model.impl.resources;
 
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.core.Log;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.*;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.DBeaverPreferences;
@@ -173,11 +173,11 @@ public class ScriptsHandlerImpl extends AbstractResourceHandler {
     }
 
     @Override
-    public void openResource(IResource resource, IWorkbenchWindow window) throws CoreException, DBException
+    public void openResource(IResource resource) throws CoreException, DBException
     {
         if (resource instanceof IFile) {
             SQLEditorInput sqlInput = new SQLEditorInput((IFile)resource);
-            window.getActivePage().openEditor(
+            DBeaverUI.getActiveWorkbenchWindow().getActivePage().openEditor(
                 sqlInput,
                 SQLEditor.class.getName());
         } else {
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/bookmarks/BookmarksHandlerImpl.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/bookmarks/BookmarksHandlerImpl.java
index 42f1af1da9e9167ad4a788b6c216780d854f0fe5..a680ee1fcf89c57f58cd3af09570970791fb9a29 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/bookmarks/BookmarksHandlerImpl.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/bookmarks/BookmarksHandlerImpl.java
@@ -24,7 +24,6 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.core.DBeaverCore;
@@ -92,7 +91,7 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
     }
 
     @Override
-    public void openResource(final IResource resource, final IWorkbenchWindow window) throws CoreException, DBException
+    public void openResource(final IResource resource) throws CoreException, DBException
     {
         if (!(resource instanceof IFile)) {
             return;
@@ -120,7 +119,7 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
                             @Override
                             public void run()
                             {
-                            openNodeByPath(dsNode, (IFile) resource, storage, window);
+                            openNodeByPath(dsNode, (IFile) resource, storage);
                             }
                         });
                     }
@@ -132,7 +131,7 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
         }
     }
 
-    private void openNodeByPath(final DBNDataSource dsNode, final IFile file, final BookmarkStorage storage, final IWorkbenchWindow window)
+    private void openNodeByPath(final DBNDataSource dsNode, final IFile file, final BookmarkStorage storage)
     {
         try {
             DBeaverUI.runInProgressService(new DBRRunnableWithProgress() {
@@ -169,7 +168,7 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
                                 @Override
                                 public void run()
                                 {
-                                    NavigatorHandlerObjectOpen.openEntityEditor(databaseNode, null, window);
+                                    NavigatorHandlerObjectOpen.openEntityEditor(databaseNode, null, DBeaverUI.getActiveWorkbenchWindow());
                                 }
                             });
                         } else if (currentNode != null) {
@@ -183,7 +182,7 @@ public class BookmarksHandlerImpl extends AbstractResourceHandler {
                 }
             });
         } catch (InvocationTargetException e) {
-            UIUtils.showErrorDialog(window.getShell(), CoreMessages.model_project_open_bookmark, CoreMessages.model_project_cant_open_bookmark, e.getTargetException());
+            UIUtils.showErrorDialog(null, CoreMessages.model_project_open_bookmark, CoreMessages.model_project_cant_open_bookmark, e.getTargetException());
         } catch (InterruptedException e) {
             // do nothing
         }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
index 4c22b37563f80999a255efd4d48c9db04684378b..23f27f35a3720e6ce8b7d8d8d1c04d549b8e5ec5 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
@@ -17,7 +17,6 @@
  */
 package org.jkiss.dbeaver.model.impl.sql.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.model.DBPNamedObject2;
@@ -74,9 +73,9 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject & DBPSaveabl
     }
 
     @Override
-    public final OBJECT_TYPE createNewObject(IWorkbenchWindow workbenchWindow, DBECommandContext commandContext, CONTAINER_TYPE parent, Object copyFrom)
+    public final OBJECT_TYPE createNewObject(DBECommandContext commandContext, CONTAINER_TYPE parent, Object copyFrom)
     {
-        OBJECT_TYPE newObject = createDatabaseObject(workbenchWindow, commandContext, parent, copyFrom);
+        OBJECT_TYPE newObject = createDatabaseObject(commandContext, parent, copyFrom);
         if (newObject == null) {
             return null;
         }
@@ -103,7 +102,6 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject & DBPSaveabl
     }
 
     protected abstract OBJECT_TYPE createDatabaseObject(
-        IWorkbenchWindow workbenchWindow,
         DBECommandContext context,
         CONTAINER_TYPE parent,
         Object copyFrom);
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/project/DBPResourceHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/project/DBPResourceHandler.java
index d4f8edbbffe8df7cf183b5b54148bce402d801ab..784113e76097a210f3c7a9d402e800408ea3585b 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/project/DBPResourceHandler.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/project/DBPResourceHandler.java
@@ -20,7 +20,6 @@ package org.jkiss.dbeaver.model.project;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
@@ -42,7 +41,7 @@ public interface DBPResourceHandler {
 
     DBNNode makeNavigatorNode(DBNNode parentNode, IResource resource) throws CoreException, DBException;
 
-    void openResource(IResource resource, IWorkbenchWindow window) throws CoreException, DBException;
+    void openResource(IResource resource) throws CoreException, DBException;
 
     String getTypeName(IResource resource);
 
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
index 53479296e9c038bde109a151c1d92c1b0d09f372..4db73317a28a8eb9d9549596f672ca4021599ce6 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java
@@ -22,7 +22,6 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.ISaveablePart;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -1143,9 +1142,9 @@ public class DataSourceDescriptor
     }
 
     @Override
-    public void editObject(IWorkbenchWindow workbenchWindow)
+    public void editObject()
     {
-        EditConnectionDialog dialog = new EditConnectionDialog(workbenchWindow, new EditConnectionWizard(this));
+        EditConnectionDialog dialog = new EditConnectionDialog(DBeaverUI.getActiveWorkbenchWindow(), new EditConnectionWizard(this));
         dialog.open();
     }
 
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 3042ada7165927b81ebb0f753d81b5f96087f1fe..819a95990645b9c9a4b3e2584c650b9daf53c7d5 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,9 +17,9 @@
  */
 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;
 import org.jkiss.dbeaver.model.DBPConnectionInfo;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
 import org.jkiss.dbeaver.model.edit.DBEObjectMaker;
@@ -63,7 +63,7 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
     }
 
     @Override
-    public DataSourceDescriptor createNewObject(IWorkbenchWindow workbenchWindow, DBECommandContext commandContext, DataSourceRegistry parent, Object copyFrom)
+    public DataSourceDescriptor createNewObject(DBECommandContext commandContext, DataSourceRegistry parent, Object copyFrom)
     {
         if (copyFrom != null) {
             DataSourceDescriptor dsTpl = (DataSourceDescriptor)copyFrom;
@@ -92,7 +92,8 @@ public class DataSourceDescriptorManager extends AbstractObjectManager<DataSourc
             } else {
                 registry = DBeaverCore.getInstance().getProjectRegistry().getActiveDataSourceRegistry();
             }
-            CreateConnectionDialog dialog = new CreateConnectionDialog(workbenchWindow,
+            CreateConnectionDialog dialog = new CreateConnectionDialog(
+                DBeaverUI.getActiveWorkbenchWindow(),
                 new NewConnectionWizard(registry));
             dialog.open();
         }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectCreateBase.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectCreateBase.java
index 493abaacf1309ca11d658fe135d9667c743100ac..7ffebf3c53291302833a5181e67e0e4702deb4bd 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectCreateBase.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectCreateBase.java
@@ -78,7 +78,7 @@ public abstract class NavigatorHandlerObjectCreateBase extends NavigatorHandlerO
                 openEditor);
 
             final Object parentObject = container.getValueObject();
-            DBSObject result = objectMaker.createNewObject(workbenchWindow, commandTarget.getContext(), parentObject, sourceObject);
+            DBSObject result = objectMaker.createNewObject(commandTarget.getContext(), parentObject, sourceObject);
             if (result == null) {
                 return true;
             }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectOpen.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectOpen.java
index c17f160335ed8cc64414f62bafecf17f9ef1fe9b..2080602d486eac9bd3721871b09096fd49d71307 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectOpen.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectOpen.java
@@ -93,7 +93,7 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
         try {
             DBPResourceHandler handler = DBeaverCore.getInstance().getProjectRegistry().getResourceHandler(resource);
             if (handler != null) {
-                handler.openResource(resource, window);
+                handler.openResource(resource);
             }
         } catch (Exception e) {
             UIUtils.showErrorDialog(window.getShell(), CoreMessages.actions_navigator_error_dialog_open_resource_title, "Can't open resource '" + resource.getName() + "'", e); //$NON-NLS-3$
@@ -125,7 +125,7 @@ public class NavigatorHandlerObjectOpen extends NavigatorHandlerObjectBase imple
         IWorkbenchWindow workbenchWindow)
     {
         if (selectedNode.getObject() instanceof DBEPrivateObjectEditor) {
-            ((DBEPrivateObjectEditor)selectedNode.getObject()).editObject(workbenchWindow);
+            ((DBEPrivateObjectEditor)selectedNode.getObject()).editObject();
             return null;
         }
         if (!selectedNode.isPersisted()) {
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/NavigatorViewBase.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/NavigatorViewBase.java
index dccfa443b36b746428c54baad0c9b66e3feb36a3..3ae8880fe4554d8f7d3b965d73c7dfa691905cc5 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/NavigatorViewBase.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/views/navigator/database/NavigatorViewBase.java
@@ -144,7 +144,7 @@ public abstract class NavigatorViewBase extends ViewPart implements INavigatorMo
                             NavigatorViewBase.DoubleClickBehavior.valueOf(DBeaverCore.getGlobalPreferenceStore().getString(DBeaverPreferences.NAVIGATOR_CONNECTION_DOUBLE_CLICK));
                         switch (doubleClickBehavior) {
                             case EDIT:
-                                dataSource.editObject(getSite().getWorkbenchWindow());
+                                dataSource.editObject();
                                 break;
                             case CONNECT:
                                 if (dataSource.isConnected()) {
diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2AbstractDropOnlyManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2AbstractDropOnlyManager.java
index b4ab0df74a23ab7d076119dbf2027e95981f7331..78676c83df4ced9a88a9dcbeebb6799ee05b1407 100644
--- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2AbstractDropOnlyManager.java
+++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2AbstractDropOnlyManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.db2.manager;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.model.DBPSaveableObject;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
@@ -62,8 +61,8 @@ public abstract class DB2AbstractDropOnlyManager<OBJECT_TYPE extends DBSObject &
     }
 
     @Override
-    protected OBJECT_TYPE createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, CONTAINER_TYPE owner,
-        Object copyFrom)
+    protected OBJECT_TYPE createDatabaseObject(DBECommandContext context, CONTAINER_TYPE owner,
+                                               Object copyFrom)
     {
         return null;
     }
diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2ForeignKeyManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2ForeignKeyManager.java
index e9c4abf30847a40187ba04b8f978d1e51865c60c..b091340b9d1b396ef4416b7eaca682782e06d3f5 100644
--- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2ForeignKeyManager.java
+++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2ForeignKeyManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.db2.manager;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.db2.DB2Messages;
 import org.jkiss.dbeaver.ext.db2.model.DB2Table;
@@ -84,10 +84,10 @@ public class DB2ForeignKeyManager extends SQLForeignKeyManager<DB2TableForeignKe
     // Create
     // ------
     @Override
-    public DB2TableForeignKey createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, DB2Table db2Table,
-        Object from)
+    public DB2TableForeignKey createDatabaseObject(DBECommandContext context, DB2Table db2Table,
+                                                   Object from)
     {
-        EditForeignKeyDialog editDialog = new EditForeignKeyDialog(workbenchWindow.getShell(),
+        EditForeignKeyDialog editDialog = new EditForeignKeyDialog(DBeaverUI.getActiveWorkbenchShell(),
             DB2Messages.edit_db2_foreign_key_manager_dialog_title, db2Table, FK_RULES);
         if (editDialog.open() != IDialogConstants.OK_ID) {
             return null;
diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2IndexManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2IndexManager.java
index 1bce9f471e5c6bca92565200ce51560c8d4b4828..66fa3ee768c8a2f4e27c9e10a8b993d07bffd6f5 100644
--- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2IndexManager.java
+++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2IndexManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.db2.manager;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.db2.DB2Messages;
 import org.jkiss.dbeaver.ext.db2.model.DB2Index;
 import org.jkiss.dbeaver.ext.db2.model.DB2IndexColumn;
@@ -76,10 +76,10 @@ public class DB2IndexManager extends SQLIndexManager<DB2Index, DB2Table> {
     }
 
     @Override
-    protected DB2Index createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, DB2Table db2Table,
-        Object from)
+    protected DB2Index createDatabaseObject(DBECommandContext context, DB2Table db2Table,
+                                            Object from)
     {
-        EditIndexDialog editDialog = new EditIndexDialog(workbenchWindow.getShell(),
+        EditIndexDialog editDialog = new EditIndexDialog(DBeaverUI.getActiveWorkbenchShell(),
             DB2Messages.edit_db2_index_manager_dialog_title, db2Table, IX_TYPES);
         if (editDialog.open() != IDialogConstants.OK_ID) {
             return null;
diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2SchemaManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2SchemaManager.java
index 0bd91f195e2efac85ebe9e5f5252f57e2e4a8fe6..33344a1e4f40666425244de5d41f1b2edf34036d 100644
--- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2SchemaManager.java
+++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2SchemaManager.java
@@ -25,8 +25,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.db2.model.DB2DataSource;
@@ -62,10 +62,10 @@ public class DB2SchemaManager extends SQLObjectEditor<DB2Schema, DB2DataSource>
     }
 
     @Override
-    protected DB2Schema createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, DB2DataSource parent,
-        Object copyFrom)
+    protected DB2Schema createDatabaseObject(DBECommandContext context, DB2DataSource parent,
+                                             Object copyFrom)
     {
-        NewSchemaDialog dialog = new NewSchemaDialog(workbenchWindow.getShell());
+        NewSchemaDialog dialog = new NewSchemaDialog(DBeaverUI.getActiveWorkbenchShell());
         if (dialog.open() != IDialogConstants.OK_ID) {
             return null;
         }
diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2SequenceManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2SequenceManager.java
index 0c81fbd9793952016ebe3ff1559b318cc8587694..1f91058547834a2c2a1a9d5a79aacda3d0bd68ec 100644
--- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2SequenceManager.java
+++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2SequenceManager.java
@@ -19,9 +19,9 @@
 package org.jkiss.dbeaver.ext.db2.manager;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.db2.DB2Messages;
 import org.jkiss.dbeaver.ext.db2.model.DB2Schema;
@@ -73,12 +73,11 @@ public class DB2SequenceManager extends SQLObjectEditor<DB2Sequence, DB2Schema>
     }
 
     @Override
-    protected DB2Sequence createDatabaseObject(IWorkbenchWindow workbenchWindow,
-                                               DBECommandContext context,
+    protected DB2Sequence createDatabaseObject(DBECommandContext context,
                                                DB2Schema db2Schema,
                                                Object copyFrom)
     {
-        CreateEntityDialog dialog = new CreateEntityDialog(workbenchWindow.getShell(),
+        CreateEntityDialog dialog = new CreateEntityDialog(DBeaverUI.getActiveWorkbenchShell(),
             db2Schema.getDataSource(),
             DB2Messages.edit_db2_sequence_manager_dialog_title);
         if (dialog.open() != IDialogConstants.OK_ID) {
diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableColumnManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableColumnManager.java
index 76816349e6b008641e29fa27a822828e27174e95..926e3a4ae5dbac8938ba4b4321e6beb38126a68b 100644
--- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableColumnManager.java
+++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableColumnManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.db2.manager;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.db2.model.DB2Table;
@@ -85,8 +84,8 @@ public class DB2TableColumnManager extends SQLTableColumnManager<DB2TableColumn,
     // ------
 
     @Override
-    protected DB2TableColumn createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, DB2TableBase parent,
-        Object copyFrom)
+    protected DB2TableColumn createDatabaseObject(DBECommandContext context, DB2TableBase parent,
+                                                  Object copyFrom)
     {
         DB2TableColumn column = new DB2TableColumn(parent);
         column.setName(DBObjectNameCaseTransformer.transformName(column, getNewColumnName(context, parent)));
diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableManager.java
index 9a3d3ca0886707c60fbc7304d8c19bd64dbac379..f7d70d3718dac8fe143c745841a2a863e3646b2a 100644
--- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableManager.java
+++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2TableManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.db2.manager;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
@@ -91,8 +90,8 @@ public class DB2TableManager extends SQLTableManager<DB2Table, DB2Schema> implem
     // ------
 
     @Override
-    public DB2Table createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, DB2Schema db2Schema,
-        Object copyFrom)
+    public DB2Table createDatabaseObject(DBECommandContext context, DB2Schema db2Schema,
+                                         Object copyFrom)
     {
         DB2Table table = new DB2Table(db2Schema, NEW_TABLE_NAME);
         try {
diff --git a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2UniqueKeyManager.java b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2UniqueKeyManager.java
index d10a3dc9626b5bea2f387e101b52040982606951..c476d7dd14948d0f8e9a52c4e5bb73dcbb74da20 100644
--- a/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2UniqueKeyManager.java
+++ b/plugins/org.jkiss.dbeaver.db2/src/org/jkiss/dbeaver/ext/db2/manager/DB2UniqueKeyManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.db2.manager;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.db2.DB2Messages;
 import org.jkiss.dbeaver.ext.db2.model.DB2Table;
 import org.jkiss.dbeaver.ext.db2.model.DB2TableColumn;
@@ -77,10 +77,10 @@ public class DB2UniqueKeyManager extends SQLConstraintManager<DB2TableUniqueKey,
     // ------
 
     @Override
-    public DB2TableUniqueKey createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, DB2Table db2Table,
-        Object from)
+    public DB2TableUniqueKey createDatabaseObject(DBECommandContext context, DB2Table db2Table,
+                                                  Object from)
     {
-        EditConstraintDialog editDialog = new EditConstraintDialog(workbenchWindow.getShell(),
+        EditConstraintDialog editDialog = new EditConstraintDialog(DBeaverUI.getActiveWorkbenchShell(),
             DB2Messages.edit_db2_constraint_manager_dialog_title, db2Table, CONS_TYPES);
         if (editDialog.open() != IDialogConstants.OK_ID) {
             return null;
diff --git a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/ERDResourceHandler.java b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/ERDResourceHandler.java
index 21b509fd7ef70574e8f3ab651144a5d59a1d32d6..86ebaa60df791bf0c812c9322c9de9829a568599 100644
--- a/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/ERDResourceHandler.java
+++ b/plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/navigator/ERDResourceHandler.java
@@ -23,7 +23,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.DBeaverUI;
@@ -98,14 +97,14 @@ public class ERDResourceHandler extends AbstractResourceHandler {
     }
 
     @Override
-    public void openResource(final IResource resource, final IWorkbenchWindow window) throws CoreException, DBException
+    public void openResource(final IResource resource) throws CoreException, DBException
     {
         if (!(resource instanceof IFile)) {
             return;
         }
 
         ERDEditorInput erdInput = new ERDEditorInput((IFile)resource);
-        window.getActivePage().openEditor(
+        DBeaverUI.getActiveWorkbenchWindow().getActivePage().openEditor(
             erdInput,
             ERDEditorStandalone.class.getName());
     }
diff --git a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericForeignKeyManager.java b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericForeignKeyManager.java
index dd43e2d07cd6940089f3e171250e0b4d8ffa94c5..1c3fa8ed189412d575ba4cef8f7f3b3d37e1214a 100644
--- a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericForeignKeyManager.java
+++ b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericForeignKeyManager.java
@@ -18,8 +18,8 @@
 package org.jkiss.dbeaver.ext.generic.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.generic.model.*;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
 import org.jkiss.dbeaver.model.impl.DBObjectNameCaseTransformer;
@@ -44,10 +44,10 @@ public class GenericForeignKeyManager extends SQLForeignKeyManager<GenericTableF
     }
 
     @Override
-    protected GenericTableForeignKey createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, GenericTable table, Object from)
+    protected GenericTableForeignKey createDatabaseObject(DBECommandContext context, GenericTable table, Object from)
     {
         EditForeignKeyDialog editDialog = new EditForeignKeyDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             "Create foreign key",
             table,
             new DBSForeignKeyModifyRule[] {
diff --git a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericIndexManager.java b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericIndexManager.java
index 0224eff5d756d68071735d0371623c27050a5922..6d8e8eedc16e1dd2873ce37f4f6f5f0382c1ae78 100644
--- a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericIndexManager.java
+++ b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericIndexManager.java
@@ -18,8 +18,8 @@
 package org.jkiss.dbeaver.ext.generic.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.generic.model.GenericTable;
 import org.jkiss.dbeaver.ext.generic.model.GenericTableColumn;
 import org.jkiss.dbeaver.ext.generic.model.GenericTableIndex;
@@ -50,12 +50,11 @@ public class GenericIndexManager extends SQLIndexManager<GenericTableIndex, Gene
 
     @Override
     protected GenericTableIndex createDatabaseObject(
-        IWorkbenchWindow workbenchWindow,
         DBECommandContext context, GenericTable parent,
         Object from)
     {
         EditIndexDialog editDialog = new EditIndexDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             "Create index",
             parent,
             Collections.singletonList(DBSIndexType.OTHER));
diff --git a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericPrimaryKeyManager.java b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericPrimaryKeyManager.java
index ae68e7523ab7d16f77c1b0e32c895b790f7a280e..df25e8af92697a128ff6614324b3b27481a2c848 100644
--- a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericPrimaryKeyManager.java
+++ b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericPrimaryKeyManager.java
@@ -18,8 +18,8 @@
 package org.jkiss.dbeaver.ext.generic.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.generic.model.*;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
 import org.jkiss.dbeaver.model.impl.DBObjectNameCaseTransformer;
@@ -45,12 +45,11 @@ public class GenericPrimaryKeyManager extends SQLConstraintManager<GenericPrimar
 
     @Override
     protected GenericPrimaryKey createDatabaseObject(
-        IWorkbenchWindow workbenchWindow,
         DBECommandContext context, GenericTable parent,
         Object from)
     {
         EditConstraintDialog editDialog = new EditConstraintDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             "Create constraint",
             parent,
             new DBSEntityConstraintType[] {DBSEntityConstraintType.PRIMARY_KEY} );
diff --git a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericTableColumnManager.java b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericTableColumnManager.java
index e863ece6a3e58689afb73abb05d190b16c755442..1d7bd1a09c63fd59fd54e254d27c4994c3d7defe 100644
--- a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericTableColumnManager.java
+++ b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericTableColumnManager.java
@@ -18,7 +18,6 @@
 
 package org.jkiss.dbeaver.ext.generic.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ext.generic.GenericConstants;
 import org.jkiss.dbeaver.ext.generic.model.GenericTable;
@@ -48,7 +47,7 @@ public class GenericTableColumnManager extends SQLTableColumnManager<GenericTabl
     }
 
     @Override
-    protected GenericTableColumn createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, GenericTable parent, Object copyFrom)
+    protected GenericTableColumn createDatabaseObject(DBECommandContext context, GenericTable parent, Object copyFrom)
     {
         DBSDataType columnType = findBestDataType(parent.getDataSource(), DBConstants.DEFAULT_DATATYPE_NAMES);
 
diff --git a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericTableManager.java b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericTableManager.java
index f9fd629865f5767450f6d8111fe6b0bc5bd92b40..5b71ae0d9380538cf90bde6fc58446404565e606 100644
--- a/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericTableManager.java
+++ b/plugins/org.jkiss.dbeaver.generic/src/org/jkiss/dbeaver/ext/generic/edit/GenericTableManager.java
@@ -17,7 +17,6 @@
  */
 package org.jkiss.dbeaver.ext.generic.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
@@ -55,7 +54,7 @@ public class GenericTableManager extends SQLTableManager<GenericTable, GenericSt
     }
 
     @Override
-    protected GenericTable createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, GenericStructContainer parent, Object copyFrom)
+    protected GenericTable createDatabaseObject(DBECommandContext context, GenericStructContainer parent, Object copyFrom)
     {
         final GenericTable table = new GenericTable(parent);
         try {
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLCatalogManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLCatalogManager.java
index 98a36ed9eefc278f94df1fc11966c6e7e37c162d..4d136ad7b43f6b4780c3c405b0927d0c1eb39605 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLCatalogManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLCatalogManager.java
@@ -18,9 +18,9 @@
  */
 package org.jkiss.dbeaver.ext.mysql.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.mysql.MySQLMessages;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
@@ -52,9 +52,9 @@ public class MySQLCatalogManager extends SQLObjectEditor<MySQLCatalog, MySQLData
     }
 
     @Override
-    protected MySQLCatalog createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, MySQLDataSource parent, Object copyFrom)
+    protected MySQLCatalog createDatabaseObject(DBECommandContext context, MySQLDataSource parent, Object copyFrom)
     {
-        String schemaName = EnterNameDialog.chooseName(workbenchWindow.getShell(), MySQLMessages.edit_catalog_manager_dialog_schema_name);
+        String schemaName = EnterNameDialog.chooseName(DBeaverUI.getActiveWorkbenchShell(), MySQLMessages.edit_catalog_manager_dialog_schema_name);
         if (CommonUtils.isEmpty(schemaName)) {
             return null;
         }
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLConstraintManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLConstraintManager.java
index 11b6d56f17bd72c5326c930d7191e39db5239204..e40d7e03b07550f53ada094c24b33158c6b3944f 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLConstraintManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLConstraintManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.mysql.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.mysql.MySQLMessages;
 import org.jkiss.dbeaver.ext.mysql.model.*;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
@@ -46,12 +46,11 @@ public class MySQLConstraintManager extends SQLConstraintManager<MySQLTableConst
 
     @Override
     protected MySQLTableConstraint createDatabaseObject(
-        IWorkbenchWindow workbenchWindow,
         DBECommandContext context, MySQLTable parent,
         Object from)
     {
         EditConstraintDialog editDialog = new EditConstraintDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             MySQLMessages.edit_constraint_manager_title,
             parent,
             new DBSEntityConstraintType[] {
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLForeignKeyManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLForeignKeyManager.java
index 2764c2e2e9e0f4a94eca039e74223b0781404ef1..85d552daa64d6afccc5e38f2366b256acc1463a0 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLForeignKeyManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLForeignKeyManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.mysql.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.mysql.MySQLMessages;
 import org.jkiss.dbeaver.ext.mysql.model.*;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
@@ -45,10 +45,10 @@ public class MySQLForeignKeyManager extends SQLForeignKeyManager<MySQLTableForei
     }
 
     @Override
-    protected MySQLTableForeignKey createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, MySQLTable table, Object from)
+    protected MySQLTableForeignKey createDatabaseObject(DBECommandContext context, MySQLTable table, Object from)
     {
         EditForeignKeyDialog editDialog = new EditForeignKeyDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             MySQLMessages.edit_foreign_key_manager_title,
             table,
             new DBSForeignKeyModifyRule[] {
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLIndexManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLIndexManager.java
index b64d2130aceaa86c733ab99165aa2d1f3e17b957..3704bbf8e5896586573920419a72083bca5d199c 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLIndexManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLIndexManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.mysql.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.mysql.MySQLMessages;
 import org.jkiss.dbeaver.ext.mysql.model.*;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
@@ -48,12 +48,11 @@ public class MySQLIndexManager extends SQLIndexManager<MySQLTableIndex, MySQLTab
 
     @Override
     protected MySQLTableIndex createDatabaseObject(
-        IWorkbenchWindow workbenchWindow,
         DBECommandContext context, MySQLTable parent,
         Object from)
     {
         EditIndexDialog editDialog = new EditIndexDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             MySQLMessages.edit_index_manager_title,
             parent,
             Collections.singletonList(DBSIndexType.OTHER));
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLProcedureManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLProcedureManager.java
index d7b0042e4ded1028a8a3669a3d1c71fdfa107763..f1bf7b0ee96e15a46a12e99f4a313e6c431f41c5 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLProcedureManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLProcedureManager.java
@@ -19,9 +19,9 @@
 package org.jkiss.dbeaver.ext.mysql.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLProcedure;
@@ -63,9 +63,9 @@ public class MySQLProcedureManager extends SQLObjectEditor<MySQLProcedure, MySQL
     }
 
     @Override
-    protected MySQLProcedure createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, MySQLCatalog parent, Object copyFrom)
+    protected MySQLProcedure createDatabaseObject(DBECommandContext context, MySQLCatalog parent, Object copyFrom)
     {
-        CreateProcedureDialog dialog = new CreateProcedureDialog(workbenchWindow.getShell(), parent.getDataSource());
+        CreateProcedureDialog dialog = new CreateProcedureDialog(DBeaverUI.getActiveWorkbenchShell(), parent.getDataSource());
         if (dialog.open() != IDialogConstants.OK_ID) {
             return null;
         }
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableColumnManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableColumnManager.java
index c4fdb3d54d14d2e9c742864cd73c460c4bc8dc29..e279cc1470b31e2fc044fba47c91dd59ff8eaa3d 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableColumnManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableColumnManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.mysql.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLTableBase;
@@ -63,7 +62,7 @@ public class MySQLTableColumnManager extends SQLTableColumnManager<MySQLTableCol
     }
 
     @Override
-    protected MySQLTableColumn createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, MySQLTableBase parent, Object copyFrom)
+    protected MySQLTableColumn createDatabaseObject(DBECommandContext context, MySQLTableBase parent, Object copyFrom)
     {
         DBSDataType columnType = findBestDataType(parent.getDataSource(), "varchar"); //$NON-NLS-1$
 
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableManager.java
index ae523e2ad04565ef394962d43d0a5084f733efff..5e656c6f0c9f8d2c7fdbfb98c752e522617617c9 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLTableManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.mysql.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
@@ -53,7 +52,7 @@ public class MySQLTableManager extends SQLTableManager<MySQLTableBase, MySQLCata
     }
 
     @Override
-    protected MySQLTable createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, MySQLCatalog parent, Object copyFrom)
+    protected MySQLTable createDatabaseObject(DBECommandContext context, MySQLCatalog parent, Object copyFrom)
     {
         final MySQLTable table = new MySQLTable(parent);
         try {
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLUserManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLUserManager.java
index ddf96b57d00951dcb348fee65c535ece24c67421..4c09740e42110b7a94e8c268d6545988f95900f0 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLUserManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLUserManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.mysql.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ext.mysql.MySQLMessages;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLDataSource;
@@ -65,7 +64,7 @@ public class MySQLUserManager extends AbstractObjectManager<MySQLUser> implement
     }
 
     @Override
-    public MySQLUser createNewObject(IWorkbenchWindow workbenchWindow, DBECommandContext commandContext, MySQLDataSource parent, Object copyFrom)
+    public MySQLUser createNewObject(DBECommandContext commandContext, MySQLDataSource parent, Object copyFrom)
     {
         MySQLUser newUser = new MySQLUser(parent, null);
         if (copyFrom instanceof MySQLUser) {
diff --git a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLViewManager.java b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLViewManager.java
index 089bb5515df02a14b40d5fe83fe925bf341f8cfc..24fc1b8b7d0eaae7826e61acee1b693a397476b9 100644
--- a/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLViewManager.java
+++ b/plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/edit/MySQLViewManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.mysql.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
@@ -64,7 +63,7 @@ public class MySQLViewManager extends SQLObjectEditor<MySQLTableBase, MySQLCatal
     }
 
     @Override
-    protected MySQLView createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, MySQLCatalog parent, Object copyFrom)
+    protected MySQLView createDatabaseObject(DBECommandContext context, MySQLCatalog parent, Object copyFrom)
     {
         MySQLView newCatalog = new MySQLView(parent);
         newCatalog.setName("NewView"); //$NON-NLS-1$
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleConstraintManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleConstraintManager.java
index 9ff9763b9424c1163b91f13fddee85e980cdd0af..e5a1ff3d1892d5d4862a6914bd34b4ea37b3d7c3 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleConstraintManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleConstraintManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.oracle.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.oracle.OracleMessages;
 import org.jkiss.dbeaver.ext.oracle.model.*;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
@@ -47,12 +47,11 @@ public class OracleConstraintManager extends SQLConstraintManager<OracleTableCon
 
     @Override
     protected OracleTableConstraint createDatabaseObject(
-        IWorkbenchWindow workbenchWindow,
         DBECommandContext context, OracleTableBase parent,
         Object from)
     {
         EditConstraintDialog editDialog = new EditConstraintDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             OracleMessages.edit_oracle_constraint_manager_dialog_title,
             parent,
             new DBSEntityConstraintType[] {
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleDataTypeManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleDataTypeManager.java
index 4692b1dd68368f13ae37d6b6c7aeac577eca8111..bfe6d22cc54b80562a8cb72f44bbffb56dea4b9d 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleDataTypeManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleDataTypeManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.oracle.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.oracle.OracleMessages;
 import org.jkiss.dbeaver.ext.oracle.model.OracleDataType;
@@ -50,9 +50,9 @@ public class OracleDataTypeManager extends SQLObjectEditor<OracleDataType, Oracl
     }
 
     @Override
-    protected OracleDataType createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleSchema parent, Object copyFrom)
+    protected OracleDataType createDatabaseObject(DBECommandContext context, OracleSchema parent, Object copyFrom)
     {
-        CreateEntityDialog dialog = new CreateEntityDialog(workbenchWindow.getShell(), parent.getDataSource(), OracleMessages.edit_oracle_data_type_manager_dialog_title);
+        CreateEntityDialog dialog = new CreateEntityDialog(DBeaverUI.getActiveWorkbenchShell(), parent.getDataSource(), OracleMessages.edit_oracle_data_type_manager_dialog_title);
         if (dialog.open() != IDialogConstants.OK_ID) {
             return null;
         }
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleForeignKeyManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleForeignKeyManager.java
index c5ec6f6ad44be9e22747df69cc61aff115833490..8008bb1bc72547fd1df11067a364dafb5a0a71d4 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleForeignKeyManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleForeignKeyManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.oracle.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.oracle.OracleMessages;
 import org.jkiss.dbeaver.ext.oracle.model.*;
 import org.jkiss.dbeaver.model.edit.DBECommandContext;
@@ -46,10 +46,10 @@ public class OracleForeignKeyManager extends SQLForeignKeyManager<OracleTableFor
     }
 
     @Override
-    protected OracleTableForeignKey createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleTableBase table, Object from)
+    protected OracleTableForeignKey createDatabaseObject(DBECommandContext context, OracleTableBase table, Object from)
     {
         EditForeignKeyDialog editDialog = new EditForeignKeyDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             OracleMessages.edit_oracle_foreign_key_manager_dialog_title,
             table,
             new DBSForeignKeyModifyRule[] {
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleIndexManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleIndexManager.java
index 16b65dddc951ba0dbc1bc93a8228bb65894c3bd0..208400b6b6f0033ca8584226d3c67f879a38170f 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleIndexManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleIndexManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.oracle.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.ext.oracle.OracleMessages;
 import org.jkiss.dbeaver.ext.oracle.model.OracleTableColumn;
 import org.jkiss.dbeaver.ext.oracle.model.OracleTableIndex;
@@ -53,12 +53,11 @@ public class OracleIndexManager extends SQLIndexManager<OracleTableIndex, Oracle
 
     @Override
     protected OracleTableIndex createDatabaseObject(
-        IWorkbenchWindow workbenchWindow,
         DBECommandContext context, OracleTablePhysical parent,
         Object from)
     {
         EditIndexDialog editDialog = new EditIndexDialog(
-            workbenchWindow.getShell(),
+            DBeaverUI.getActiveWorkbenchShell(),
             OracleMessages.edit_oracle_index_manager_dialog_title,
             parent,
             Collections.singletonList(DBSIndexType.OTHER));
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleMaterializedViewManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleMaterializedViewManager.java
index a2108a0b0ec17fed25b441e0b1789328c8010171..3cd450ce88552a33d9ca638578ca1ae50ff354da 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleMaterializedViewManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleMaterializedViewManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.oracle.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
@@ -63,7 +62,7 @@ public class OracleMaterializedViewManager extends SQLObjectEditor<OracleMateria
     }
 
     @Override
-    protected OracleMaterializedView createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleSchema parent, Object copyFrom)
+    protected OracleMaterializedView createDatabaseObject(DBECommandContext context, OracleSchema parent, Object copyFrom)
     {
         OracleMaterializedView newView = new OracleMaterializedView(parent, "NewView"); //$NON-NLS-1$
         return newView;
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OraclePackageManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OraclePackageManager.java
index 99709e1e84eedb50b393d8825aaff5f3d669e60c..85f40f1e2b60fdb8a7650462076606ee9e82a59c 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OraclePackageManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OraclePackageManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.oracle.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.oracle.OracleMessages;
 import org.jkiss.dbeaver.ext.oracle.model.OraclePackage;
@@ -50,9 +50,9 @@ public class OraclePackageManager extends SQLObjectEditor<OraclePackage, OracleS
     }
 
     @Override
-    protected OraclePackage createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleSchema parent, Object copyFrom)
+    protected OraclePackage createDatabaseObject(DBECommandContext context, OracleSchema parent, Object copyFrom)
     {
-        CreateEntityDialog dialog = new CreateEntityDialog(workbenchWindow.getShell(), parent.getDataSource(), OracleMessages.edit_oracle_package_manager_dialog_title);
+        CreateEntityDialog dialog = new CreateEntityDialog(DBeaverUI.getActiveWorkbenchShell(), parent.getDataSource(), OracleMessages.edit_oracle_package_manager_dialog_title);
         if (dialog.open() != IDialogConstants.OK_ID) {
             return null;
         }
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleProcedureManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleProcedureManager.java
index 4917fd29bc914af51f12f051fd5ef317638e11d5..8332128dc2870c7019408295525d9d173c6d4986 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleProcedureManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleProcedureManager.java
@@ -19,8 +19,8 @@
 package org.jkiss.dbeaver.ext.oracle.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.oracle.model.OracleProcedureStandalone;
 import org.jkiss.dbeaver.ext.oracle.model.OracleSchema;
@@ -48,9 +48,9 @@ public class OracleProcedureManager extends SQLObjectEditor<OracleProcedureStand
     }
 
     @Override
-    protected OracleProcedureStandalone createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleSchema parent, Object copyFrom)
+    protected OracleProcedureStandalone createDatabaseObject(DBECommandContext context, OracleSchema parent, Object copyFrom)
     {
-        CreateProcedureDialog dialog = new CreateProcedureDialog(workbenchWindow.getShell(), parent.getDataSource());
+        CreateProcedureDialog dialog = new CreateProcedureDialog(DBeaverUI.getActiveWorkbenchShell(), parent.getDataSource());
         if (dialog.open() != IDialogConstants.OK_ID) {
             return null;
         }
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleSchemaManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleSchemaManager.java
index 40d0905e6d550b1fe2fc5a0431ef49d7c0f7822a..9962f286e85b6d9fec0f4a5e29b8b4cd61d49ae8 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleSchemaManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleSchemaManager.java
@@ -26,9 +26,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.oracle.model.OracleDataSource;
 import org.jkiss.dbeaver.ext.oracle.model.OracleSchema;
@@ -62,9 +62,9 @@ public class OracleSchemaManager extends SQLObjectEditor<OracleSchema, OracleDat
     }
 
     @Override
-    protected OracleSchema createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleDataSource parent, Object copyFrom)
+    protected OracleSchema createDatabaseObject(DBECommandContext context, OracleDataSource parent, Object copyFrom)
     {
-        NewUserDialog dialog = new NewUserDialog(workbenchWindow.getShell(), parent);
+        NewUserDialog dialog = new NewUserDialog(DBeaverUI.getActiveWorkbenchShell(), parent);
         if (dialog.open() != IDialogConstants.OK_ID) {
             return null;
         }
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableColumnManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableColumnManager.java
index ad0cf2087a182d0a418f7834c61384e71966a1c7..c0a5326d0ba8022bcf2a5dfeca96380b3c098519 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableColumnManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableColumnManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.oracle.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.oracle.model.OracleDataType;
@@ -63,7 +62,7 @@ public class OracleTableColumnManager extends SQLTableColumnManager<OracleTableC
     }
 
     @Override
-    protected OracleTableColumn createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleTableBase parent, Object copyFrom)
+    protected OracleTableColumn createDatabaseObject(DBECommandContext context, OracleTableBase parent, Object copyFrom)
     {
         DBSDataType columnType = findBestDataType(parent.getDataSource(), "varchar2"); //$NON-NLS-1$
 
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableManager.java
index 1d1b716e687d34fc5b54cfa7c65a7340e1d73e9c..f9db4051585b4994a3fc718d1ddca7593078240d 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTableManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.oracle.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
@@ -54,7 +53,7 @@ public class OracleTableManager extends SQLTableManager<OracleTable, OracleSchem
     }
 
     @Override
-    protected OracleTable createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleSchema parent, Object copyFrom)
+    protected OracleTable createDatabaseObject(DBECommandContext context, OracleSchema parent, Object copyFrom)
     {
         OracleTable table = new OracleTable(parent, "");
         try {
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTriggerManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTriggerManager.java
index 0284735859871dbc44ba93fc89755da3209e6a53..3ff8be13ee3992f2e245c16df89b0c7fa6c1849b 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTriggerManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleTriggerManager.java
@@ -19,9 +19,9 @@
 package org.jkiss.dbeaver.ext.oracle.edit;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.core.DBeaverUI;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
 import org.jkiss.dbeaver.ext.oracle.OracleMessages;
 import org.jkiss.dbeaver.ext.oracle.model.OracleTableBase;
@@ -66,9 +66,9 @@ public class OracleTriggerManager extends SQLObjectEditor<OracleTrigger, OracleT
     }
 
     @Override
-    protected OracleTrigger createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleTableBase parent, Object copyFrom)
+    protected OracleTrigger createDatabaseObject(DBECommandContext context, OracleTableBase parent, Object copyFrom)
     {
-        CreateEntityDialog dialog = new CreateEntityDialog(workbenchWindow.getShell(), parent.getDataSource(), OracleMessages.edit_oracle_trigger_manager_dialog_title);
+        CreateEntityDialog dialog = new CreateEntityDialog(DBeaverUI.getActiveWorkbenchShell(), parent.getDataSource(), OracleMessages.edit_oracle_trigger_manager_dialog_title);
         if (dialog.open() != IDialogConstants.OK_ID) {
             return null;
         }
diff --git a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleViewManager.java b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleViewManager.java
index d258316f5403a4809d086a3fd69d1164fca29e37..c6a7c695d3bdf931ceacc7f17372f820602d4919 100644
--- a/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleViewManager.java
+++ b/plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/edit/OracleViewManager.java
@@ -18,7 +18,6 @@
  */
 package org.jkiss.dbeaver.ext.oracle.edit;
 
-import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.edit.DBEPersistAction;
@@ -67,7 +66,7 @@ public class OracleViewManager extends SQLObjectEditor<OracleView, OracleSchema>
     }
 
     @Override
-    protected OracleView createDatabaseObject(IWorkbenchWindow workbenchWindow, DBECommandContext context, OracleSchema parent, Object copyFrom)
+    protected OracleView createDatabaseObject(DBECommandContext context, OracleSchema parent, Object copyFrom)
     {
         OracleView newView = new OracleView(parent, "NewView"); //$NON-NLS-1$
         return newView;