diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 644c7b0866b..b81de5e6d05 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -182,14 +182,16 @@
            type="new"
            wizardId="org.eclipse.cdt.ui.wizards.ConvertToMakeWizard">
 		 <enablement>
-			<and>
-	            <adapt type="org.eclipse.core.resources.IProject"/>
-	            <not>
-	               <test
-	                     property="org.eclipse.core.resources.projectNature"
-	                     value="org.eclipse.cdt.core.cnature"/>
-	            </not>
-			</and>
+		 	<and>
+	            <adapt type="org.eclipse.core.resources.IProject" />
+				<not>
+		            <adapt type="org.eclipse.core.resources.IProject" >
+		               <test
+		                     property="org.eclipse.core.resources.projectNature"
+		                     value="org.eclipse.cdt.core.cnature"/>
+		            </adapt>
+				</not>
+		 	</and>
          </enablement>
       </commonWizard>
   </extension>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
index 1d90f2764c4..03b9a3e352d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
@@ -440,6 +440,11 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
 			super.postRefresh(((ICProject)element).getProject());
 		} else if (element instanceof ICElement) {
 			super.postRefresh(element);
+		} else if (element instanceof IResource) {
+			IProject project= ((IResource)element).getProject();
+			if (CoreModel.hasCNature(project)) {
+				super.postRefresh(element);
+			}
 		}
 	}
 
@@ -456,6 +461,11 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
 			super.postAdd(((ICProject)parent).getProject(), element);
 		} else if (parent instanceof ICElement) {
 			super.postAdd(parent, element);
+		} else if (element instanceof IResource) {
+			IProject project= ((IResource)element).getProject();
+			if (CoreModel.hasCNature(project)) {
+				super.postAdd(parent, element);
+			}
 		}
 	}