diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
index 35e20a0e733..ebc610bf8e7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java
@@ -163,9 +163,15 @@ public class BuildConsolePage extends Page
 
 	protected void setProject(IProject project) {
 		if (fProject != project && project.isAccessible()) {
+			fProject = project;
+
 			ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project);
-			if (projDesc!=null) {
-				fProject = project;
+			if (projDesc == null) {
+				// don't support logging for non-C/C++ projects
+				fSaveConsoleAction.setChecked(false);
+				fSaveConsoleAction.setEnabled(false);
+			} else {
+				fSaveConsoleAction.setEnabled(true);
 				fSaveConsoleAction.setChecked(false);
 				ICConfigurationDescription configDesc = projDesc.getActiveConfiguration();
 				// Read save console log preferences