diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
index 46a411c2ab9..5932aa61cb4 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java
@@ -159,7 +159,8 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab {
 			cnt++;
 		}
 		// "No toolchain" is enabled for Make projects only.
-		if (!cfg.getBuilder().isManagedBuildOn())
+		if (!b_dispCompatible.getSelection() && 
+			!cfg.getBuilder().isManagedBuildOn())
 			c_toolchain.add(NO_TC);
 		if (pos != -1) {
 			c_toolchain.select(pos);