diff --git a/codeblocks/src/plugins/scriptedwizard/resources/arduino/wizard.script b/codeblocks/src/plugins/scriptedwizard/resources/arduino/wizard.script
index a6a96ecd..4a6efdff 100644
--- a/codeblocks/src/plugins/scriptedwizard/resources/arduino/wizard.script
+++ b/codeblocks/src/plugins/scriptedwizard/resources/arduino/wizard.script
@@ -32,7 +32,22 @@ function BeginWizard()
                              "This wizard is created by Stanley Huang.\nFor updates, please visit http://www.arduinodev.com/codeblocks\nFor suggestions and bug reports, please send to\n<stanleyhuangyc@gmail.com>");
 
         Wizard.AddInfoPage(_T("Intro"), intro_msg);
-        Wizard.AddPage(_T("processorChoice"));
+
+
+        BoardIndex = Wizard.GetComboboxSelection(_T("comboboxBoard"));
+        Board = Wizard.GetComboboxStringSelection(_T("comboboxBoard"));
+        AvrUpload = Wizard.IsCheckboxChecked(_T("checkboxUpload"));
+        AvrPort = Wizard.GetComboboxStringSelection(_T("uploadPort"));
+        AvrMap = Wizard.IsCheckboxChecked(_T("checkboxMap"));
+        AvrLss = Wizard.IsCheckboxChecked(_T("checkboxLss"));
+
+        if (IsNull(AvrPort)) {
+            AvrPort = Wizard.GetTextControlValue(_T("uploadPort"));
+            if (IsNull(AvrPort)) {
+                AvrUpload = false;
+            }
+        }
+
         Wizard.AddProjectPathPage();
         Wizard.AddCompilerPage(_T("GNU AVR GCC Compiler"), _T("avr*"), true, true);
     }
@@ -46,34 +61,6 @@ function GetFilesDir()
     return result;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Processor choice page
-////////////////////////////////////////////////////////////////////////////////
-
-
-function OnLeave_processorChoice(fwd)
-{
-    if (fwd)
-    {
-
-	BoardIndex = Wizard.GetComboboxSelection(_T("comboboxBoard"));
-	Board = Wizard.GetComboboxStringSelection(_T("comboboxBoard"));
-	AvrUpload = Wizard.IsCheckboxChecked(_T("checkboxUpload"));
-	AvrPort = Wizard.GetComboboxStringSelection(_T("uploadPort"));
-	AvrMap = Wizard.IsCheckboxChecked(_T("checkboxMap"));
-	AvrLss = Wizard.IsCheckboxChecked(_T("checkboxLss"));
-
-	if (IsNull(AvrPort)) {
-		AvrPort = Wizard.GetTextControlValue(_T("uploadPort"));
-		if (IsNull(AvrPort)) {
-			AvrUpload = false;
-		}
-	}
-
-    }
-    return true;
-}
-
 function AddSourceFile(project, targetName, filename)
 {
 	local file;