diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectNameLocationSettings.java b/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectNameLocationSettings.java
new file mode 100644
index 000000000000..f10b3e074d61
--- /dev/null
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectNameLocationSettings.java
@@ -0,0 +1,41 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.ide.projectWizard;
+
+import com.intellij.ide.util.projectWizard.ModuleNameLocationSettings;
+import com.intellij.ide.util.projectWizard.NamePathComponent;
+import org.jetbrains.annotations.NotNull;
+
+public class NewProjectNameLocationSettings implements ModuleNameLocationSettings {
+  private final NamePathComponent myProjectNamePathComponent;
+  private final ModuleNameLocationComponent myModuleNameLocationComponent;
+
+  public NewProjectNameLocationSettings(NamePathComponent projectNamePathComponent,
+                                        ModuleNameLocationComponent moduleNameLocationComponent) {
+    myProjectNamePathComponent = projectNamePathComponent;
+    myModuleNameLocationComponent = moduleNameLocationComponent;
+  }
+
+  @NotNull
+  @Override
+  public String getModuleName() {
+    return myModuleNameLocationComponent.getModuleName();
+  }
+
+  @Override
+  public void setModuleName(@NotNull String moduleName) {
+    myProjectNamePathComponent.getNameComponent().setText(moduleName);
+    myModuleNameLocationComponent.setModuleName(moduleName);
+  }
+
+  @NotNull
+  @Override
+  public String getModuleContentRoot() {
+    return myModuleNameLocationComponent.getModuleContentRoot();
+  }
+
+  @Override
+  public void setModuleContentRoot(@NotNull String path) {
+    myProjectNamePathComponent.setPath(path);
+    myModuleNameLocationComponent.setModuleContentRoot(path);
+  }
+}
diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectSettingsStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectSettingsStep.java
index d8b4d944d433..e111b4acd892 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectSettingsStep.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectSettingsStep.java
@@ -224,7 +224,8 @@ public class ProjectSettingsStep extends ModuleWizardStep implements SettingsSte
   @Nullable
   @Override
   public ModuleNameLocationSettings getModuleNameLocationSettings() {
-    return myModuleNameLocationComponent;
+    return myWizardContext.isCreatingNewProject() ? new NewProjectNameLocationSettings(myNamePathComponent, myModuleNameLocationComponent)
+                                                  : myModuleNameLocationComponent;
   }
 
   @TestOnly