diff --git a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ProjectSettingsStepBase.java b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ProjectSettingsStepBase.java
index 3cf19e9410af..edaa2bb4c3d2 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ProjectSettingsStepBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/projectWizard/ProjectSettingsStepBase.java
@@ -68,7 +68,6 @@ public class ProjectSettingsStepBase<T> extends AbstractActionWithPanel implemen
     getTemplatePresentation().setText(projectGenerator.getName());
     myProjectGenerator = projectGenerator;
     myCallback = callback;
-    initLazyPeer();
     myProjectDirectory = findSequentNonExistingUntitled();
   }
 
@@ -81,13 +80,13 @@ public class ProjectSettingsStepBase<T> extends AbstractActionWithPanel implemen
     checkWebProjectValid();
   }
 
-  private void initLazyPeer() {
-    myLazyGeneratorPeer = myProjectGenerator.createLazyPeer();
+  protected NotNullLazyValue<ProjectGeneratorPeer<T>> createLazyPeer() {
+    return myProjectGenerator.createLazyPeer();
   }
 
   @Override
   public JPanel createPanel() {
-    initLazyPeer();
+    myLazyGeneratorPeer = createLazyPeer();
     final JPanel mainPanel = new JPanel(new BorderLayout());
 
     final JLabel label = createErrorLabel();