diff --git a/tools/eclipse/config_wizard/src/org/chibios/tools/eclipse/config/wizards/NewApplicationProjectWizard.java b/tools/eclipse/config_wizard/src/org/chibios/tools/eclipse/config/wizards/NewApplicationProjectWizard.java
index 8f0ff5471..f2488b74b 100644
--- a/tools/eclipse/config_wizard/src/org/chibios/tools/eclipse/config/wizards/NewApplicationProjectWizard.java
+++ b/tools/eclipse/config_wizard/src/org/chibios/tools/eclipse/config/wizards/NewApplicationProjectWizard.java
@@ -18,7 +18,6 @@ import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -122,7 +121,7 @@ public class NewApplicationProjectWizard extends Wizard implements INewWizard {
 
     /* Step #2, makes it a CDT project.*/
     desc = workspace.newProjectDescription(projectName);
-    project = CCorePlugin.getDefault().createCDTProject(desc, project, new NullProgressMonitor());
+    project = CCorePlugin.getDefault().createCDTProject(desc, project, null);
 
     ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
     ICProjectDescription cdesc = mngr.createProjectDescription(project, false);
diff --git a/tools/eclipse/config_wizard/src/org/chibios/tools/eclipse/config/wizards/NewApplicationProjectWizardPage.java b/tools/eclipse/config_wizard/src/org/chibios/tools/eclipse/config/wizards/NewApplicationProjectWizardPage.java
index ca22d46c2..5513bc5bf 100644
--- a/tools/eclipse/config_wizard/src/org/chibios/tools/eclipse/config/wizards/NewApplicationProjectWizardPage.java
+++ b/tools/eclipse/config_wizard/src/org/chibios/tools/eclipse/config/wizards/NewApplicationProjectWizardPage.java
@@ -162,7 +162,6 @@ public class NewApplicationProjectWizardPage extends WizardPage {
     projectParentPathText.setEnabled(false);
     btnBrowse.setEnabled(false);
 
-
     /* Retrieving the resource path of the processors.xml file. */
     String fpath;
     try {
@@ -201,6 +200,9 @@ public class NewApplicationProjectWizardPage extends WizardPage {
 
     /* Update checks on the fields.*/
     projectPageUpdated();
+    
+    /* Focus on the first editable field.*/
+    projectNameText.setFocus();
   }
 
   public String getProjectName() {