IDEA-130840 'keymap' configurable is modified after open Preferences

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 078bbbf22de6ae8dba1eeaaad8afe1872954f3c6..582a3ef40a8297e0cb5f2c51007da5050e76b2a4 100644 (file)
--- 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
@@ -814,6 +814,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
     }
 
     myKeymapList.setSelectedItem(mySelectedKeymap);
+    myActionsTree.reset(mySelectedKeymap, getCurrentQuickListIds());
   }
 
   @Override
@@ -863,7 +864,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
     Keymap[] managerKeymaps = ContainerUtil.filter(keymapManager.getAllKeymaps(), new Condition<Keymap>() {
       @Override
       public boolean value(Keymap keymap) {
-        return !KeymapManager.DEFAULT_IDEA_KEYMAP.equals(keymap.getName());
+        return !SystemInfo.isMac || !KeymapManager.DEFAULT_IDEA_KEYMAP.equals(keymap.getName());
       }
     }).toArray(new Keymap[]{});
     Keymap[] panelKeymaps = new Keymap[myKeymapListModel.getSize()];