diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java
index 8547e6bf369..804a5718b84 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/WorkingSetConfigAction.java
@@ -76,6 +76,7 @@ public class WorkingSetConfigAction implements IWorkbenchWindowActionDelegate, I
 	}
 	
 	public void selectionChanged(IAction action, ISelection selection) {
+		checkWS();
 		if (action.isEnabled() != enabled)
 			action.setEnabled(enabled);
 	}