diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index b74047feb80..098c54b846d 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -597,7 +597,6 @@
          </filter>
          <enabledWhen>
             <and>
-               <test property="org.eclipse.cdt.ui.toolEditEnabled" value="" />
             <or>
 		     <instanceof value="org.eclipse.core.resources.IProject"/>
 		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
@@ -606,7 +605,7 @@
 		     <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
 
 		     <and>
-	`	        <instanceof value="org.eclipse.core.resources.IFile"/>
+		        <instanceof value="org.eclipse.core.resources.IFile"/>
     	        <test property="org.eclipse.cdt.ui.isSource" value="" />
              </and>
              <and>
@@ -614,6 +613,7 @@
     	        <test property="org.eclipse.cdt.ui.isSource" value="" />
 	         </and>	
 		    </or>
+            <test property="org.eclipse.cdt.ui.toolEditEnabled" value="" />
 		    </and>          
          </enabledWhen>
       </page>
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index cd7e983bf67..f59dd7fbc13 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1910,30 +1910,24 @@
 
   <extension
         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+           id="org.eclipse.cdt.Tester3"
+           class="org.eclipse.cdt.ui.newui.PropertyTester"
+           namespace="org.eclipse.cdt.ui"
+           properties="toolEditEnabled"
+           type="org.eclipse.core.runtime.IAdaptable"/>
       <propertyTester
            id="org.eclipse.cdt.Tester1"
            class="org.eclipse.cdt.ui.newui.PropertyTester"
            namespace="org.eclipse.cdt.ui"
-           properties="isSource,toolEditEnabled"
+           properties="isSource"
            type="org.eclipse.cdt.core.model.ITranslationUnit"/>
       <propertyTester
            id="org.eclipse.cdt.Tester2"
            class="org.eclipse.cdt.ui.newui.PropertyTester"
            namespace="org.eclipse.cdt.ui"
-           properties="isSource,toolEditEnabled"
+           properties="isSource"
            type="org.eclipse.core.resources.IFile"/>
-      <propertyTester
-           id="org.eclipse.cdt.Tester3"
-           class="org.eclipse.cdt.ui.newui.PropertyTester"
-           namespace="org.eclipse.cdt.ui"
-           properties="toolEditEnabled"
-           type="org.eclipse.cdt.core.model.IResource"/>
-      <propertyTester
-           id="org.eclipse.cdt.Tester4"
-           class="org.eclipse.cdt.ui.newui.PropertyTester"
-           namespace="org.eclipse.cdt.ui"
-           properties="toolEditEnabled"
-           type="org.eclipse.cdt.core.model.ICElement"/>
   </extension>
   <extension
         point="org.eclipse.ui.exportWizards">