diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
index 03644edb3463..15e4deaffd6e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
@@ -330,11 +330,12 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
   }
 
   private void filterTreeByShortcut(Shortcut shortcut) {
-    myTreeExpansionMonitor.freeze();
+    boolean wasFreezed = myTreeExpansionMonitor.isFreeze();
+    if (!wasFreezed) myTreeExpansionMonitor.freeze();
     myActionsTree.filterTree(shortcut, myQuickLists);
     final JTree tree = myActionsTree.getTree();
     TreeUtil.expandAll(tree);
-    myTreeExpansionMonitor.restore();
+    if (!wasFreezed) myTreeExpansionMonitor.restore();
   }
 
   public void showOption(String option) {