diff --git a/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml b/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
index e90a24c68bb6d9fb4c38adffb909dea7a2e4e782..1de482f46cf34985c84536e032f837760c0f2a18 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
@@ -19,15 +19,6 @@
   -->
 <plugin>
 
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            class="org.jkiss.dbeaver.debug.internal.ui.DebugContributionFactory"
-            locationURI="popup:org.eclipse.ui.popup.any?before=additions">
-      </menuContribution>
-   </extension>
-
    <extension
          point="org.eclipse.core.runtime.adapters">
       <factory
@@ -37,6 +28,13 @@
                type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget">
          </adapter>
       </factory>
+      <factory
+            adaptableType="org.jkiss.dbeaver.ui.editors.entity.EntityEditorInput"
+            class="org.jkiss.dbeaver.debug.internal.ui.actions.DebugActionAdapterFactory">
+         <adapter
+               type="org.eclipse.debug.ui.actions.ILaunchable">
+         </adapter>
+      </factory>
    </extension>
 
    <extension
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionFactory.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionFactory.java
deleted file mode 100644
index 53c0633bb7d25fac2a68d9fa489bf296a51677d9..0000000000000000000000000000000000000000
--- a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- * Copyright (C) 2017 Alexander Fedorov (alexander.fedorov@jkiss.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jkiss.dbeaver.debug.internal.ui;
-
-import org.eclipse.debug.ui.DebugUITools;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.jkiss.dbeaver.debug.ui.LaunchContributionFactory;
-import org.jkiss.dbeaver.debug.ui.LaunchContributionItem;
-import org.jkiss.dbeaver.debug.ui.DebugUi;
-
-public class DebugContributionFactory extends LaunchContributionFactory {
-
-    public DebugContributionFactory() {
-        super(DebugUi.DEBUG_AS_MENU_ID);
-        setText(DebugUiMessages.DebugContributionFactory_text);
-        setImageDescriptor(DebugUITools.getImageDescriptor(IDebugUIConstants.IMG_ACT_DEBUG));
-    }
-
-    @Override
-    protected LaunchContributionItem createContributionItem()
-    {
-        return new DebugContributionItem();
-    }
-}
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionItem.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionItem.java
deleted file mode 100644
index 9c263848db0aac1e9b0d0e5d6a76100d6e593ce9..0000000000000000000000000000000000000000
--- a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugContributionItem.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
- * Copyright (C) 2017 Alexander Fedorov (alexander.fedorov@jkiss.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jkiss.dbeaver.debug.internal.ui;
-
-import org.eclipse.debug.core.ILaunchManager;
-import org.jkiss.dbeaver.debug.ui.LaunchContributionItem;
-
-public class DebugContributionItem extends LaunchContributionItem {
-
-    protected DebugContributionItem()
-    {
-        super(ILaunchManager.DEBUG_MODE);
-    }
-
-}
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.java
index d0fdcb34ea88db9fed116c675f5ac7853b3734ad..a90b60cc9ca19f6e0d061969aeffa40478be6bf4 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.java
+++ b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.java
@@ -28,7 +28,7 @@ public class DebugUiMessages extends NLS {
     public static String DatabaseTab_datasource_group_text;
     public static String DatabaseTab_datasource_label_text;
     public static String DatabaseTab_name;
-    public static String DebugContributionFactory_text;
+
     public static String LaunchShortcut_e_launch;
     public static String LaunchShortcut_select_cobfiguration_title;
     static {
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.properties b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.properties
index e1b34723c9272b0c5aaf420b8c97f8acf3533a7a..a1320e4883d039e5555d2b74220814600a9824fd 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.properties
+++ b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/DebugUiMessages.properties
@@ -1,4 +1,3 @@
-DatabaseStandardBreakpointPane_name=Breakpoint Settings
 # DBeaver - Universal Database Manager
 # Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
 # Copyright (C) 2017 Alexander Fedorov (alexander.fedorov@jkiss.org)
@@ -15,12 +14,13 @@ DatabaseStandardBreakpointPane_name=Breakpoint Settings
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+DatabaseStandardBreakpointPane_name=Breakpoint Settings
 DatabaseStandardBreakpointPane_description=Breakpoint settings
 DatabaseTab_database_group_text=Database
 DatabaseTab_database_label_text=Database
 DatabaseTab_datasource_group_text=Connection
 DatabaseTab_datasource_label_text=Connection
 DatabaseTab_name=&Main
-DebugContributionFactory_text=Debug As
+
 LaunchShortcut_e_launch=Launch error
 LaunchShortcut_select_cobfiguration_title=&Select existing configuration:
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/actions/DebugActionAdapterFactory.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/actions/DebugActionAdapterFactory.java
index dbd19fd36c05deea4d164d8f5af52148291cb0b4..7d3a231e25b3f85a2eda4bb1a496899846178d48 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/actions/DebugActionAdapterFactory.java
+++ b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/internal/ui/actions/DebugActionAdapterFactory.java
@@ -1,12 +1,16 @@
 package org.jkiss.dbeaver.debug.internal.ui.actions;
 
 import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.debug.ui.actions.ILaunchable;
 import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
 import org.jkiss.dbeaver.debug.ui.actions.ToggleSqlBreakpointTarget;
 
 public class DebugActionAdapterFactory implements IAdapterFactory {
 
-    private static final Class<?>[] CLASSES = new Class[]{IToggleBreakpointsTarget.class};
+    private static final Class<?>[] CLASSES = new Class[] { ILaunchable.class, IToggleBreakpointsTarget.class };
+
+    private static final ILaunchable LAUNCHABLE = new ILaunchable() {
+    };
 
     private final IToggleBreakpointsTarget toggleBreakpointTarget = new ToggleSqlBreakpointTarget();
 
@@ -14,6 +18,9 @@ public class DebugActionAdapterFactory implements IAdapterFactory {
     @SuppressWarnings("unchecked")
     public <T> T getAdapter(Object adaptableObject, Class<T> adapterType)
     {
+        if (adapterType == ILaunchable.class) {
+            return (T) LAUNCHABLE;
+        }
         if (adapterType == IToggleBreakpointsTarget.class) {
             return (T) toggleBreakpointTarget;
         }