diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 1c82db3534a7..9ccedde445fd 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -732,7 +732,7 @@ action.ToggleTemporaryLineBreakpoint.text=Toggle Temporary Line Breakpoint
 action.ToggleTemporaryLineBreakpoint.description=Toggle temporary line breakpoint at caret
 action.ViewBreakpoints.text=View Brea_kpoints...
 action.ViewBreakpoints.description=View and manage all breakpoints and watchpoints
-action.EditBreakpoint.text=Edit
+action.EditBreakpoint.text=Edit breakpoint
 action.ExportThreads.text=Export T_hreads...
 action.ExportThreads.description=Save all threads information to a text file or clipboard
 action.Runner.RestoreLayout.text=Restore Layout
diff --git a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
index a38e9a4eb5e8..f06cb2f4939c 100644
--- a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
+++ b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
@@ -9,9 +9,9 @@ debugger.hotswap.display.name=HotSwap
 xdebugger.default.content.title=Debug
 xdebugger.debugger.tab.title=Debugger
 
-xdebugger.remove.line.breakpoint.action.text=Remove
-xdebugger.disable.breakpoint.action.text=Disable
-xdebugger.enable.breakpoint.action.text=Enable
+xdebugger.remove.line.breakpoint.action.text=Remove breakpoint
+xdebugger.disable.breakpoint.action.text=Disable breakpoint
+xdebugger.enable.breakpoint.action.text=Enable breakpoint
 xdebugger.view.breakpoint.properties.action=Properties
 xdebugger.view.breakpoint.reveal.action=Show Breakpoints Dialog
 xdebugger.view.breakpoint.edit.action=Edit
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java
index 5fe396d952cd..9683ba106986 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/EditBreakpointAction.java
@@ -16,6 +16,8 @@
 package com.intellij.xdebugger.impl.actions;
 
 import com.intellij.idea.ActionsBundle;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.editor.Editor;
@@ -38,6 +40,8 @@ public class EditBreakpointAction extends XDebuggerActionBase implements DumbAwa
       myRenderer = breakpointRenderer;
       myBreakpoint = breakpoint;
       myDebuggerSupport = debuggerSupport;
+      AnAction action = ActionManager.getInstance().getAction("ViewBreakpoints");
+      copyShortcutFrom(action);
     }
 
     @Override
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/RemoveBreakpointGutterIconAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/RemoveBreakpointGutterIconAction.java
index dadb944ba5c7..c8b34bb3ec03 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/RemoveBreakpointGutterIconAction.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/RemoveBreakpointGutterIconAction.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.xdebugger.impl.breakpoints;
 
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.xdebugger.XDebuggerBundle;
@@ -26,6 +28,8 @@ class RemoveBreakpointGutterIconAction extends DumbAwareAction {
   RemoveBreakpointGutterIconAction(XBreakpointBase<?, ?, ?> breakpoint) {
     super(XDebuggerBundle.message("xdebugger.remove.line.breakpoint.action.text"));
     myBreakpoint = breakpoint;
+    AnAction action = ActionManager.getInstance().getAction("ToggleLineBreakpoint");
+    copyShortcutFrom(action);
   }
 
   public void actionPerformed(final AnActionEvent e) {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ToggleBreakpointGutterIconAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ToggleBreakpointGutterIconAction.java
index 52734f6008da..010f8a2bf96f 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ToggleBreakpointGutterIconAction.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ToggleBreakpointGutterIconAction.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.xdebugger.impl.breakpoints;
 
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.xdebugger.XDebuggerBundle;
@@ -29,6 +31,8 @@ class ToggleBreakpointGutterIconAction extends DumbAwareAction {
   ToggleBreakpointGutterIconAction(XBreakpoint<?> breakpoint) {
     super(breakpoint.isEnabled() ? XDebuggerBundle.message("xdebugger.disable.breakpoint.action.text") : XDebuggerBundle.message("xdebugger.enable.breakpoint.action.text"));
     this.myBreakpoint = breakpoint;
+    AnAction action = ActionManager.getInstance().getAction("ToggleBreakpointEnabled");
+    copyShortcutFrom(action);
   }
 
   public void actionPerformed(final AnActionEvent e) {