diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java
index f551f4cfef4..85ebe279ebf 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/ToolsSettingsBlock.java
@@ -402,10 +402,11 @@ public class ToolsSettingsBlock extends AbstractCOptionPage {
 			// There is a selected tool defined
 			primary = selectedTool;
 		} else if (selectedCategory != null) {
-//		if (selectedCategory != null) {
 			// There is a selected option or category
 			primary = selectedCategory;
-		} else {
+		} 
+		
+		if (primary == null) {
 			// Select the first tool in the list
 			Object[] elements = null;
 			if( element instanceof IProject){