diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPropertyPage.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPropertyPage.java
index 8390e668df0..3a4998f0277 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPropertyPage.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPropertyPage.java
@@ -979,7 +979,12 @@ public class CBreakpointPropertyPage extends FieldEditorPreferencePage implement
 	 */
 	@Override
 	public void setElement( IAdaptable element ) {
-		fElement = element;
+		if (element instanceof ICBreakpoint) {
+			fElement = new CBreakpointContext((ICBreakpoint)element, null);
+		}
+		else {
+			fElement = element;
+		}
 	}
 
 	protected String[] getDebugModelIds() {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBDynamicPrintfPropertyPage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBDynamicPrintfPropertyPage.java
index 9d5e2b894ce..bbe70f6ff6a 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBDynamicPrintfPropertyPage.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBDynamicPrintfPropertyPage.java
@@ -477,7 +477,12 @@ public class GDBDynamicPrintfPropertyPage extends FieldEditorPreferencePage impl
 	 */
     @Override
 	public void setElement(IAdaptable element) {
-		fElement = element;
+    	if (element instanceof ICBreakpoint) {
+			fElement = new CBreakpointContext((ICBreakpoint)element, null);
+		}
+		else {
+			fElement = element;
+		}
 	}
 
 	protected String[] getDebugModelIds() {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBTracepointPropertyPage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBTracepointPropertyPage.java
index 4456cc61db4..8bf7eddd1dd 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBTracepointPropertyPage.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/breakpoints/GDBTracepointPropertyPage.java
@@ -476,7 +476,12 @@ public class GDBTracepointPropertyPage extends FieldEditorPreferencePage impleme
 	 */
     @Override
 	public void setElement(IAdaptable element) {
-		fElement = element;
+    	if (element instanceof ICBreakpoint) {
+			fElement = new CBreakpointContext((ICBreakpoint)element, null);
+		}
+		else {
+			fElement = element;
+		}
 	}
 
 	protected String[] getDebugModelIds() {