diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java
index 14544afa8dd1..d0f9e4ca5dd2 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTemplateList.java
@@ -142,7 +142,7 @@ public class ProjectTemplateList extends JPanel {
 
   void restoreSelection() {
     final String templateName = PropertiesComponent.getInstance().getValue(PROJECT_WIZARD_TEMPLATE);
-    if (templateName != null) {
+    if (templateName != null && myList.getModel() instanceof CollectionListModel) {
       List<ProjectTemplate> list = ((CollectionListModel<ProjectTemplate>)myList.getModel()).toList();
       ProjectTemplate template = ContainerUtil.find(list, new Condition<ProjectTemplate>() {
         @Override
diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
index 180aa1edbaf2..1e96ffa7ab69 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
@@ -143,10 +143,10 @@ public class ProjectTypeStep extends ModuleWizardStep implements Disposable, Act
         myProjectTypeList.setSelectedValue(group, true);
       }
     }
-    myTemplatesList.restoreSelection();
     if (myProjectTypeList.getSelectedValue() == null) {
       myProjectTypeList.setSelectedIndex(0);
     }
+    myTemplatesList.restoreSelection();
   }
 
   private List<TemplatesGroup> fillTemplatesMap(WizardContext context) {