diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java
index 346a91df0f7..03d7f5bdeae 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CodeFormatterConfigurationBlock.java
@@ -173,4 +173,12 @@ public class CodeFormatterConfigurationBlock extends ProfileConfigurationBlock {
 		}
 		return super.performOk();
 	}
+
+	@Override
+	public void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
+		if (fCustomCodeFormatterBlock != null) {
+			fCustomCodeFormatterBlock.enableProjectSpecificSettings(useProjectSpecificSettings);
+		}
+		super.enableProjectSpecificSettings(useProjectSpecificSettings);
+	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
index f4f78946cba..c8648c50273 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/CustomCodeFormatterBlock.java
@@ -116,6 +116,13 @@ public class CustomCodeFormatterBlock extends Observable {
 		handleFormatterChanged();
 	}
 
+	public void enableProjectSpecificSettings(boolean useProjectSpecificSettings) {
+		if (useProjectSpecificSettings) {
+			fPrefs.put(CCorePreferenceConstants.CODE_FORMATTER, fDefaultFormatterId);
+		} else {
+			initDefault();
+		}
+	}
 
 	/**
 	 * Get the currently selected formatter id.