From 9f2767bdc203de3960034f31f61896f57ca476be Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Wed, 22 Mar 2017 15:04:34 +0300
Subject: [PATCH] WEB-26079 Creating a new "Node.js Express App" fails

---
 .../util/projectWizard/ProjectSettingsStepBase.java    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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 3de5ba365954..7b11d3839aee 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
@@ -21,6 +21,8 @@ import com.intellij.icons.AllIcons;
 import com.intellij.ide.impl.ProjectUtil;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.project.DumbAware;
@@ -310,8 +312,10 @@ public class ProjectSettingsStepBase extends AbstractActionWithPanel implements
 
   @Override
   public void dispose() {
-    if (myProjectGenerator instanceof WebProjectTemplate) {
-      ((WebProjectTemplate)myProjectGenerator).reset();
-    }
+    ApplicationManager.getApplication().invokeLater(() -> {
+      if (myProjectGenerator instanceof WebProjectTemplate) {
+        ((WebProjectTemplate)myProjectGenerator).reset();
+      }
+    }, ModalityState.NON_MODAL);
   }
 }