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 895c5cd10a7..32bd97dc492 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
@@ -384,11 +384,16 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI {
 
 			// is the option on this page?
 			if (fieldsMap.containsKey(prefName)) {
+				FieldEditor fieldEditor = (FieldEditor) fieldsMap.get(prefName);
+				try {
+					if ( opt.getValueType() == IOption.ENUMERATED ) {
+						updateEnumList( fieldEditor, opt, holder, fInfo );
+					}
+				} catch ( BuildException be ) {}
+				
 				// check to see if the option has an applicability calculator
 				IOptionApplicability applicabilityCalculator = opt.getApplicabilityCalculator();
-				
 				if (applicabilityCalculator != null) {
-					FieldEditor fieldEditor = (FieldEditor) fieldsMap.get(prefName);
 					Composite parent = (Composite) fieldEditorsToParentMap.get(fieldEditor);
 					setFieldEditorEnablement(holder, opt, applicabilityCalculator, fieldEditor, parent);
 				}