diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectOpenProcessor.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectOpenProcessor.java
index 68b7f0412afd..7bfcc52396ad 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectOpenProcessor.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleProjectOpenProcessor.java
@@ -82,18 +82,23 @@ public class GradleProjectOpenProcessor extends ProjectOpenProcessorBase<GradleP
     getBuilder().getControl(null).setLinkedProjectPath(pathToUse);
 
     final boolean result;
+    WizardContext dialogWizardContext = null;
     if (ApplicationManager.getApplication().isHeadlessEnvironment()) {
       result = setupGradleProjectSettingsInHeadlessMode(projectImportProvider, wizardContext);
     }
     else {
       AddModuleWizard dialog = new AddModuleWizard(null, file.getPath(), projectImportProvider);
-      dialog.getWizardContext().setProjectBuilder(getBuilder());
+      dialogWizardContext = dialog.getWizardContext();
+      dialogWizardContext.setProjectBuilder(getBuilder());
       dialog.navigateToStep(step -> step instanceof SelectExternalProjectStep);
       result = dialog.showAndGet();
     }
     if (result && getBuilder().getExternalProjectNode() != null) {
       wizardContext.setProjectName(getBuilder().getExternalProjectNode().getData().getInternalName());
     }
+    if(result && dialogWizardContext != null) {
+      wizardContext.setProjectStorageFormat(dialogWizardContext.getProjectStorageFormat());
+    }
     return result;
   }