diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java
index 586d7c8c700..61363693a80 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java
@@ -213,11 +213,11 @@ public class HeadlessBuilder implements IApplication {
 			IWorkspaceDescription desc = root.getWorkspace().getDescription();
 			desc.setAutoBuilding(isAutoBuilding);
 			root.getWorkspace().setDescription(desc);
-		}
 
-		// Wait for any outstanding jobs to finish
-		while (!Job.getJobManager().isIdle())
-			Thread.sleep(10);
+			// Wait for any outstanding jobs to finish
+			while (!Job.getJobManager().isIdle())
+				Thread.sleep(10);
+		}
 
 		return OK;
 	}