From 5fa33422043eee286ab68472e9b157669fcec2dd Mon Sep 17 00:00:00 2001 From: Vitaly Legchilkin Date: Fri, 13 Feb 2026 16:21:25 +0100 Subject: [PATCH] PY-70732 Close ComboBox popups before navigating back on ESC in welcome screen The ESC handler in ActionGroupPanelWrapper only checked StackingPopupDispatcher for open popups, missing Swing JComboBox dropdowns that use MenuSelectionManager. This caused the back action to fire while the interpreter dropdown was still open, resulting in a stuck animation. Use PopupUtil.handleEscKeyEvent() (same as DialogWrapper) to properly close ComboBox popups before navigating back. GitOrigin-RevId: 1797d76a0e25c8cb7207250b8415f87548036aea --- .../wm/impl/welcomeScreen/ActionGroupPanelWrapper.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); }