diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/GlobalActionsList.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/GlobalActionsList.java
index 54498de9ccb..6ff1ac4e7d5 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/GlobalActionsList.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpointactions/GlobalActionsList.java
@@ -73,7 +73,6 @@ public class GlobalActionsList extends Composite {
 		summaryTableColumn.setText(Messages.getString("GlobalActionsList.2")); //$NON-NLS-1$
 
 		ArrayList actions = CDebugCorePlugin.getDefault().getBreakpointActionManager().getBreakpointActions();
-		boolean hasActions = actions.size() > 0;
 
 		for (Iterator iter = CDebugCorePlugin.getDefault().getBreakpointActionManager().getBreakpointActions().iterator(); iter.hasNext();) {
 			IBreakpointAction element = (IBreakpointAction) iter.next();
@@ -114,13 +113,12 @@ public class GlobalActionsList extends Composite {
 		});
 		if (!useAttachButton)
 			editButton.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL + GridData.HORIZONTAL_ALIGN_END));
-		editButton.setEnabled(hasActions);
 
 		deleteButton = new Button(this, SWT.NONE);
 		deleteButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 		deleteButton.setText(Messages.getString("GlobalActionsList.6")); //$NON-NLS-1$
-		deleteButton.setEnabled(hasActions);
-		//
+
+		updateButtons();
 	}
 
 	public Button getAttachButton() {
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointGlobalActionsList.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointGlobalActionsList.java
index ea0ac50e32b..c7c3142579c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointGlobalActionsList.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/tracepointactions/TracepointGlobalActionsList.java
@@ -79,7 +79,6 @@ public class TracepointGlobalActionsList extends Composite {
 		summaryTableColumn.setText(MessagesForTracepointActions.TracepointActions_Summary);
 
 		ArrayList<ITracepointAction> actions = TracepointActionManager.getInstance().getActions();
-		boolean hasActions = actions.size() > 0;
 
 		for (ITracepointAction element : actions) {
 			if (isSubAction && element instanceof WhileSteppingAction) continue;
@@ -120,12 +119,12 @@ public class TracepointGlobalActionsList extends Composite {
 		});
 		if (!useAttachButton)
 			editButton.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL + GridData.HORIZONTAL_ALIGN_END));
-		editButton.setEnabled(hasActions);
 
 		deleteButton = new Button(this, SWT.NONE);
 		deleteButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
 		deleteButton.setText(MessagesForTracepointActions.TracepointActions_Delete);
-		deleteButton.setEnabled(hasActions);
+		
+		updateButtons();
 	}
 
 	public Button getAttachButton() {