diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/ActionGroupPanelWrapper.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/ActionGroupPanelWrapper.java
index c2f0ddf5ffe3..6405b1c1b5f7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/ActionGroupPanelWrapper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/ActionGroupPanelWrapper.java
@@ -14,6 +14,7 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.ui.popup.StackingPopupDispatcher;
+import com.intellij.openapi.ui.popup.util.PopupUtil;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.NlsContexts;
 import com.intellij.openapi.util.Pair;
@@ -180,7 +181,9 @@ public final class ActionGroupPanelWrapper {
 
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
-          backAction.run();
+          if (!PopupUtil.handleEscKeyEvent()) {
+            backAction.run();
+          }
         }
       }.registerCustomShortcutSet(CommonShortcuts.ESCAPE, main, parentDisposable);
     }