diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CContentTypes.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CContentTypes.java
index 9ffe97e40a8..47b2b0faed9 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CContentTypes.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CContentTypes.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -52,7 +52,7 @@ public class CContentTypes {
 				if (usesProjectSpecificContentTypes(project)) {
 					scopeCtx= new ProjectScope(project);
 				}
-				preferCpp= CoreModel.hasCCNature(project);
+				preferCpp= CoreModel.hasCCNature(project) || !CoreModel.hasCNature(project);
 			} catch (CoreException e) {
 				// fallback to workspace wide definitions.
 				matcher= Platform.getContentTypeManager();