diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index e2bd92dc753..a94a1e18c3f 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -38,7 +38,8 @@ ShowDebuggerConsoleAction.tooltip=Show Debugger Console On Target Selection
 AddBreakpoint.label=Toggle &Breakpoint\tDouble Click
 AddBreakpointInteractive.label=&Add Breakpoint...\tCtrl+Double Click
 EnableBreakpoint.label=&Toggle Breakpoint Enabled\tShift+Double Click
-BreakpointProperties.label=Breakpoint P&roperties...\tCtrl+Double Click
+BreakpointProperties.label=Breakpoint P&roperties
+RulerBreakpointProperties.label=Breakpoint P&roperties...\tCtrl+Double Click
 BreakpointPropertiesCommand.name=C/C++ Breakpoint Properties
 BreakpointPropertiesCommand.description=View and edit properties for a given C/C++ breakpoint
 ManageFunctionBreakpointAction.label=Toggle Breakpoint
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 42f77a7d2be..f59d2bf7680 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -426,7 +426,7 @@
             targetID="#CEditorRulerContext"
             id="org.eclipse.cdt.debug.ui.CEditorRulerActions">
          <action
-               label="%BreakpointProperties.label"
+               label="%RulerBreakpointProperties.label"
                helpContextId="breakpoint_properties_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.breakpoints.CBreakpointPropertiesRulerActionDelegate"
                menubarPath="debug"
@@ -504,7 +504,7 @@
             targetID="#ASMEditorRulerContext"
             id="org.eclipse.cdt.debug.ui.AsmEditorRulerActions">
          <action
-               label="%BreakpointProperties.label"
+               label="%RulerBreakpointProperties.label"
                helpContextId="breakpoint_properties_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.breakpoints.CBreakpointPropertiesRulerActionDelegate"
                menubarPath="debug"
@@ -1767,7 +1767,15 @@
              id="org.eclipse.cdt.debug.menu.command.breakpointProperties"
              label="%BreakpointProperties.label"
              tooltip="%BreakpointProperties.label">
-          <visibleWhen checkEnabled="true">
+          <visibleWhen>
+             <with variable="selection">
+               <count value="1"/>
+               <iterate>
+                   <or>
+	                  <adapt type="org.eclipse.cdt.debug.core.model.ICBreakpoint"/>
+	               </or>
+               </iterate>
+             </with>
           </visibleWhen>
        </command>
     </menuContribution>