diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java
index f00f7b94c42..395841f1485 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeProjectOptionBlock.java
@@ -18,6 +18,10 @@ import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock;
 
 public class MakeProjectOptionBlock extends TabFolderOptionBlock {
 
+	public MakeProjectOptionBlock() {
+		super(true);
+	}
+	
 	public MakeProjectOptionBlock(ICOptionContainer parent) {
 		super(parent);
 	}
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java
index 70fc162926f..bf312d6b423 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java
@@ -16,6 +16,7 @@ import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
 import org.eclipse.cdt.ui.dialogs.ICOptionContainer;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.Preferences;
+import org.eclipse.jface.preference.IPreferencePageContainer;
 import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -29,9 +30,14 @@ public class NewMakeProjectPreferencePage extends PreferencePage implements IWor
 	public NewMakeProjectPreferencePage() {
 		setPreferenceStore(MakeUIPlugin.getDefault().getPreferenceStore());
 		setDescription(MakeUIPlugin.getResourceString("MakePreferencePage.description")); //$NON-NLS-1$
-		fOptionBlock = new MakeProjectOptionBlock(this);
+		fOptionBlock = new MakeProjectOptionBlock();
 	}
 
+	
+	public void setContainer(IPreferencePageContainer preferencePageContainer) {
+		super.setContainer(preferencePageContainer);
+		fOptionBlock.setOptionContainer(this);
+	}
 	/*
 	 * @see PreferencePage#createControl(Composite)
 	 */
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java
index d118e616c80..ebe4ea54ef1 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java
@@ -38,11 +38,12 @@ public class MakePropertyPage extends PropertyPage implements ICOptionContainer
 
 	public MakePropertyPage() {
 		super();
+	    fOptionBlock = new MakeProjectOptionBlock();
 	}
 
 	public void setContainer(IPreferencePageContainer preferencePageContainer) {
 	    super.setContainer(preferencePageContainer);
-	    fOptionBlock = new MakeProjectOptionBlock(this);
+	    fOptionBlock.setOptionContainer(this);
 	}	
 	
 	protected Control createContents(Composite parent) {