diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java
index 472d1d3f6be..62471267521 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/MakeTargetDialog.java
@@ -263,17 +263,6 @@ public class MakeTargetDialog extends Dialog {
 				updateButtons();
 			}
 		});
-		if (buildCommand != null) {
-			StringBuffer cmd = new StringBuffer(buildCommand.toOSString());
-			if (!isDefaultCommand) {
-				String args = buildArguments;
-				if (args != null && !args.equals("")) { //$NON-NLS-1$
-					cmd.append(" "); //$NON-NLS-1$
-					cmd.append(args);
-				}
-			}
-			commandText.setText(cmd.toString());
-		}
 		if (isDefaultCommand) {
 			commandText.setEnabled(false);
 		} else {
@@ -322,6 +311,17 @@ public class MakeTargetDialog extends Dialog {
 			targetNameText.setText(generateUniqueName(targetString));
 		}
 		targetNameText.selectAll();
+		if (buildCommand != null) {
+			StringBuffer cmd = new StringBuffer(buildCommand.toOSString());
+			if (!isDefaultCommand) {
+				String args = buildArguments;
+				if (args != null && !args.equals("")) { //$NON-NLS-1$
+					cmd.append(" "); //$NON-NLS-1$
+					cmd.append(args);
+				}
+			}
+			commandText.setText(cmd.toString());
+		}
 	}
 
 	protected void updateButtons() {