diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java index 4b641a6dab8c..04a680c6e65a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java @@ -858,6 +858,11 @@ public class KeymapImpl implements Keymap, ExternalizableScheme { continue; } + final String useShortcutOf = myKeymapManager.getActionBinding(id); + if (useShortcutOf != null && useShortcutOf.equals(actionId)) { + continue; + } + Shortcut[] shortcuts = getShortcuts(id); for (Shortcut shortcut1 : shortcuts) { if (!(shortcut1 instanceof KeyboardShortcut)) {