diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
index 32bd97dc492..771fee9c688 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
+ * Copyright (c) 2003, 2008 IBM Corporation 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
@@ -415,8 +415,14 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
 		if (optionApplicability == null)
 			return;
 
-		// if the option is not enabled then disable it
 		IBuildObject config = fInfo;
+
+		if (!optionApplicability.isOptionVisible(config, holder, option )) {
+			fieldEditor.setEnabled(false, parent); // temporary: instead of setVisible
+			return;
+		} 
+		
+		// if the option is not enabled then disable it
 		if (!optionApplicability.isOptionEnabled(config, holder, option )) {
 			fieldEditor.setEnabled(false, parent);
 		} else {