diff --git a/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
index 6b600b4570006d0885d895315b310b05bd4f5146..ced5041d1812d2bc52931e01fab7e211ae570b32 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.eclipse.jface.text,
  org.eclipse.ui;visibility:=reexport,
+ org.eclipse.ui.workbench.texteditor,
  org.eclipse.debug.ui;visibility:=reexport,
  org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.ui,
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.debug.ui/OSGI-INF/l10n/bundle.properties
index 16ceb22e64fd00baea4e83b06dc549fb55610e2f..1f4e87e23589cc5ce7552ecdfdf1b02eb607b471 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.debug.ui/OSGI-INF/l10n/bundle.properties
@@ -17,4 +17,6 @@
 # limitations under the License.
 
 Bundle-Vendor = JKISS
-Bundle-Name = DBeaver Debug UI
\ No newline at end of file
+Bundle-Name = DBeaver Debug UI
+
+command.ToggleBreakpoint.label = Toggle Breakpoint
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml b/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
index 7a251d99794bcad0d1f012989986df33a5814f29..cec738643c11e5760199d96eaa3e481ffdd7e313 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.debug.ui/plugin.xml
@@ -60,4 +60,25 @@
       </detailFactories>
    </extension>
 
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.jkiss.dbeaver.debug.ui.actions.ToggleBreakpointHandler"
+            commandId="org.eclipse.debug.ui.commands.ToggleBreakpoint">
+      </handler>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:#SQLRulerContext?before=additions">
+         <command
+               commandId="org.eclipse.debug.ui.commands.ToggleBreakpoint"
+               label="%command.ToggleBreakpoint.label"
+               style="push">
+         </command>
+      </menuContribution>
+   </extension>
+
 </plugin>
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/actions/ToggleBreakpointHandler.java b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/actions/ToggleBreakpointHandler.java
new file mode 100644
index 0000000000000000000000000000000000000000..12610a9556e715654b64d5a8357076ded8623891
--- /dev/null
+++ b/plugins/org.jkiss.dbeaver.debug.ui/src/org/jkiss/dbeaver/debug/ui/actions/ToggleBreakpointHandler.java
@@ -0,0 +1,19 @@
+package org.jkiss.dbeaver.debug.ui.actions;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate;
+import org.eclipse.swt.widgets.Event;
+
+public class ToggleBreakpointHandler extends AbstractHandler implements IHandler {
+
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+//FIXME:AF: this is a dirty hack to enable ancient 3.x- actions with handlers, needs rework
+        RulerToggleBreakpointActionDelegate delegate = new RulerToggleBreakpointActionDelegate();
+        delegate.runWithEvent(null, (Event) event.getTrigger());
+        return null;
+    }
+
+}