diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java
index c95bdba2afc..ad8f000f230 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/model/ICBreakpoint.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.cdt.debug.core.model;
 
+import org.eclipse.cdt.debug.core.CDIDebugModel;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.model.IBreakpoint;
 
@@ -25,6 +26,16 @@ import org.eclipse.debug.core.model.IBreakpoint;
  */
 public interface ICBreakpoint extends IBreakpoint {
 
+    /**
+     * This debug model identifier can be returned by a debug implementation 
+     * to indicate that a given debugger integration is using C Breakpoints.
+     * This model ID will allow breakpoint actions to configure their default
+     * selection. 
+     * 
+     * @since 7.0
+     */
+    public static final String C_BREAKPOINTS_DEBUG_MODEL_ID = CDIDebugModel.getPluginIdentifier() + ".cbreakpoints"; //$NON-NLS-1$
+    
 	/**
 	 * Breakpoint attribute storing the number of debug targets a breakpoint is
 	 * installed in (value
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCBreakpointsTargetFactory.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCBreakpointsTargetFactory.java
index ab6c490f0bd..3546d1dd238 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCBreakpointsTargetFactory.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/ToggleCBreakpointsTargetFactory.java
@@ -10,13 +10,14 @@
  *******************************************************************************/
 package org.eclipse.cdt.debug.internal.ui.actions;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.cdt.debug.core.CDIDebugModel;
+import org.eclipse.cdt.debug.core.model.ICBreakpoint;
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugModelProvider;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
@@ -56,7 +57,15 @@ public class ToggleCBreakpointsTargetFactory implements IToggleBreakpointsTarget
                 (IDebugModelProvider)((IAdaptable)element).getAdapter(IDebugModelProvider.class);
             if (modelProvider != null) {
                 String[] models = modelProvider.getModelIdentifiers();
-                if (Arrays.asList(models).contains(CDIDebugModel.getPluginIdentifier())) {
+                for (String model : models) {
+                    if (CDIDebugModel.getPluginIdentifier().equals(model) ||
+                        ICBreakpoint.C_BREAKPOINTS_DEBUG_MODEL_ID.equals(model)) 
+                    {
+                        return TOGGLE_C_BREAKPOINT_TARGET_ID;
+                    }
+                }
+            } else if (element instanceof IDebugElement) {
+                if (CDIDebugModel.getPluginIdentifier().equals(((IDebugElement)element).getModelIdentifier()) ) {
                     return TOGGLE_C_BREAKPOINT_TARGET_ID;
                 }
             }
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java
index 27171317f2d..f0489d8e2de 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/GdbAdapterFactory.java
@@ -15,6 +15,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
 
+import org.eclipse.cdt.debug.core.model.ICBreakpoint;
 import org.eclipse.cdt.debug.core.model.IRestart;
 import org.eclipse.cdt.debug.core.model.IReverseResumeHandler;
 import org.eclipse.cdt.debug.core.model.IReverseStepIntoHandler;
@@ -179,7 +180,7 @@ public class GdbAdapterFactory
             fDebugModelProvider = new IDebugModelProvider() {
                 // @see org.eclipse.debug.core.model.IDebugModelProvider#getModelIdentifiers()
                 public String[] getModelIdentifiers() {
-                    return new String[] { GdbLaunchDelegate.GDB_DEBUG_MODEL_ID };
+                    return new String[] { GdbLaunchDelegate.GDB_DEBUG_MODEL_ID, ICBreakpoint.C_BREAKPOINTS_DEBUG_MODEL_ID };
                 }
             };
             session.registerModelAdapter(IDebugModelProvider.class, fDebugModelProvider);
diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ToggleBreakpointsTargetFactory.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ToggleBreakpointsTargetFactory.java
index c5120997003..840eaad07fe 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ToggleBreakpointsTargetFactory.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/internal/ui/ToggleBreakpointsTargetFactory.java
@@ -10,15 +10,16 @@
  *******************************************************************************/
 package org.eclipse.cdt.dsf.debug.internal.ui;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.cdt.debug.core.CDIDebugModel;
+import org.eclipse.cdt.debug.core.model.ICBreakpoint;
 import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.cdt.dsf.debug.internal.ui.disassembly.provisional.IDisassemblyPart;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.debug.core.model.IDebugElement;
 import org.eclipse.debug.core.model.IDebugModelProvider;
 import org.eclipse.debug.ui.DebugUITools;
 import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
@@ -68,18 +69,27 @@ public class ToggleBreakpointsTargetFactory implements IToggleBreakpointsTargetF
 
 	public String getDefaultToggleTarget(IWorkbenchPart part, ISelection selection) {
 		if (part instanceof IDisassemblyPart) {
-		       Object element = getDebugContext(part).getFirstElement();
-		        if (element instanceof IAdaptable) {
-		            IDebugModelProvider modelProvider = 
-		                (IDebugModelProvider)((IAdaptable)element).getAdapter(IDebugModelProvider.class);
-		            if (modelProvider != null) {
-		                String[] models = modelProvider.getModelIdentifiers();
-		                if (Arrays.asList(models).contains(CDIDebugModel.getPluginIdentifier())) {
-		                    return TOGGLE_C_BREAKPOINT_TARGET_ID;
-		                }
-		            }
-		        }
-			return null;
+	        // Return the debug context as a default if the currently selected context
+	        // is a CDT element.  Otherwise return null.
+	        Object element = getDebugContext(part).getFirstElement();
+	        if (element instanceof IAdaptable) {
+	            IDebugModelProvider modelProvider = 
+	                (IDebugModelProvider)((IAdaptable)element).getAdapter(IDebugModelProvider.class);
+	            if (modelProvider != null) {
+	                String[] models = modelProvider.getModelIdentifiers();
+	                for (String model : models) {
+	                    if (CDIDebugModel.getPluginIdentifier().equals(model) ||
+	                        ICBreakpoint.C_BREAKPOINTS_DEBUG_MODEL_ID.equals(model)) 
+	                    {
+	                        return TOGGLE_C_BREAKPOINT_TARGET_ID;
+	                    }
+	                }
+	            } else if (element instanceof IDebugElement) {
+	                if (CDIDebugModel.getPluginIdentifier().equals(((IDebugElement)element).getModelIdentifier()) ) {
+	                    return TOGGLE_C_BREAKPOINT_TARGET_ID;
+	                }
+	            }
+	        }
 		}
 		return null;
 	}