--- a/Tools__ProjectBuilderAssistantApplication.st	Fri Mar 22 16:34:45 2013 +0100
+++ b/Tools__ProjectBuilderAssistantApplication.st	Mon Mar 25 01:20:45 2013 +0100
@@ -2520,8 +2520,9 @@
     self selectedProjectIndexHolder value:(self listOfMatchingPackageIds value indexOf:aProjectDefinitionClass package).
     self hasProjectSelectedHolder value:true.
 
-    pageToGo := 3.
+    pageToGo := 2.
     type == ProjectDefinition guiApplicationType ifTrue:[
+        pageToGo := 3.
         (startupClass := aProjectDefinitionClass startupClass) notNil ifTrue:[
             self updateListOfStartupClassesInProject.
             selectedStartupClass := startupClass.
@@ -2530,6 +2531,15 @@
         ]. 
 "/    apps := (aProjectDefinitionClass classes select:[:cls | cls isKindOf:ApplicationModel])
     ].
+    type == ProjectDefinition nonGuiApplicationType ifTrue:[
+        pageToGo := 4.
+        (startupClass := aProjectDefinitionClass startupClass) notNil ifTrue:[
+            self updateListOfStartupClassesInProject.
+            selectedStartupClass := startupClass.
+            self selectedStartupClassIndexHolder value:(self listOfStartupClassesInProject value indexOf:startupClass).
+            pageToGo := 5.
+        ]. 
+    ].
     self gotoPage:pageToGo.
     self openWindow.