diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index c98bddb3fbd..af530057488 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -651,7 +651,7 @@
                tooltip="%RestoredefaultRegisterGroupsAction.tooltip">
             <enablement>
                <pluginState
-                     id="org.eclipse.cdt.debug.ui.pluginState1"
+                     id="org.eclipse.cdt.debug.ui"
                      value="activated"/>
             </enablement>
          </action>
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractViewActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractViewActionDelegate.java
index 1b0a5bb5e65..78f5bdd4637 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractViewActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractViewActionDelegate.java
@@ -174,6 +174,13 @@ public abstract class AbstractViewActionDelegate extends ActionDelegate implemen
 		shell.getDisplay().asyncExec( r );
 	}
 
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.actions.ActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
+	 */
+	public void selectionChanged( IAction action, ISelection selection ) {
+		update();
+	}
+
 	protected abstract String getErrorDialogTitle();
 
 	protected abstract String getErrorDialogMessage();