diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java
index b8a253195eb..1fb3c0f7051 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/util/AbstractResourceActionHandler.java
@@ -55,6 +55,7 @@ public abstract class AbstractResourceActionHandler extends AbstractHandler {
   @Override
   public void setEnabled(Object evaluationContext) {
     this.evaluationContext = (IEvaluationContext) evaluationContext;
+    selection = convertSelection(this.evaluationContext, null);
   }
 
   protected IStructuredSelection getSelection() {