diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java index 194620a9c4ce..87f37eb99544 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/Windows.java @@ -135,7 +135,9 @@ public class Windows { if (Arrays.stream(findShortcuts("EditorEscape")) .anyMatch(shortcut -> shortcut.equals(new KeyboardShortcut(KeyStroke.getKeyStrokeForEvent((KeyEvent)event), null)))) { - deactivationShortcutHandler.accept(id); + if(isInActiveToolWindow(event.getSource())) { + deactivationShortcutHandler.accept(id); + } } } }