diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
index f6f39c1fcd08..3deb5359fdb1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
@@ -556,7 +556,7 @@ public class ActionsTreeUtil {
         final Shortcut[] actionShortcuts =
           keymap.getShortcuts(action instanceof ActionStub ? ((ActionStub)action).getId() : actionManager.getId(action));
         for (Shortcut actionShortcut : actionShortcuts) {
-          if (shortcut.equals(actionShortcut)) {
+          if (actionShortcut != null && actionShortcut.startsWith(shortcut)) {
             return true;
           }
         }