--- a/Tools__ProjectBuilderAssistantApplication.st	Mon Oct 26 11:13:20 2009 +0100
+++ b/Tools__ProjectBuilderAssistantApplication.st	Mon Oct 26 13:54:58 2009 +0100
@@ -1027,7 +1027,7 @@
 createNewStartupClass
     <resource: #uiCallback>
 
-    |newClassName newStartupClass|
+    |newClassName newStartupClass startupApplication|
 
     newClassName := self newStartupClassName value.
     newClassName isEmptyOrNil ifTrue:[
@@ -1043,8 +1043,10 @@
                             instanceVariableNames:''
                             classVariableNames:''
                             poolDictionaries:''
-                            category:'Applications'.
-            CodeGeneratorTool createStartupCodeFor:newStartupClass forStartOf:selectedApplication.
+                            category:'Applications'.   
+
+            self projectTypeIsGuiApplication ifTrue: [startupApplication := selectedApplication].
+            CodeGeneratorTool createStartupCodeFor:newStartupClass forStartOf:startupApplication.
         ].
         self updateListOfStartupClassesInProject
     ].
@@ -1516,14 +1518,6 @@
     ^ projectTypeHolder.
 !
 
-projectTypeIsLibrary
-    ^ self projectTypeHolder value == #libraryType
-!
-
-projectTypeIsNotLibrary
-    ^ self projectTypeIsLibrary not
-!
-
 selectedApplicationIndexHolder
     <resource: #uiAspect>
 
@@ -1736,6 +1730,18 @@
 
 canEnterStartupClassSelection
     ^ self hasProjectSelected "and:[ self hasApplicationSelected ]"
+!
+
+projectTypeIsGuiApplication
+    ^ self projectTypeHolder value == #guiApplicationType
+!
+
+projectTypeIsLibrary
+    ^ self projectTypeHolder value == #libraryType
+!
+
+projectTypeIsNotLibrary
+    ^ self projectTypeIsLibrary not
 ! !
 
 !ProjectBuilderAssistantApplication methodsFor:'specs'!
@@ -1759,9 +1765,9 @@
         )
 
         (AssistantPageSpec
-            pageTitle: 'Application Selection'
+            pageTitle: 'Startup Application Selection'
             windowSpecSelector: page3_applicationSelectionSpec
-            isEnabledQuerySelector: #projectTypeIsNotLibrary
+            isEnabledQuerySelector: #projectTypeIsGuiApplication
             canEnterQuerySelector: #canEnterApplicationSelection
             enterCallbackSelector: updateListOfApplicationsInProject
             infoText: 'Choose an existing application or create a new one.