diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java
index 2702bc72ca20..7ab176fe351b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java
@@ -77,14 +77,8 @@ public class ActionsTree {
 
   private boolean myPaintInternalInfo;
   private final Map<String, String> myPluginNames = ActionsTreeUtil.createPluginActionsMap();
-  private final KeymapSelector myKeymapSelector;
 
   public ActionsTree() {
-    this(null);
-  }
-
-  ActionsTree(KeymapSelector selector) {
-    myKeymapSelector = selector;
     myRoot = new DefaultMutableTreeNode(ROOT);
 
     myTree = new Tree(new MyModel(myRoot)) {
@@ -526,8 +520,7 @@ public class ActionsTree {
       myHaveLink = false;
       myLink.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
       final boolean showIcons = UISettings.getInstance().getShowIconsInMenus();
-      Keymap parentKeymap = myKeymap == null ? null : myKeymap.getParent();
-      Keymap originalKeymap = myKeymapSelector == null ? parentKeymap : myKeymapSelector.getOriginalKeymap(myKeymap);
+      Keymap originalKeymap = myKeymap == null ? null : myKeymap.getParent();
       Icon icon = null;
       String text;
       String actionId = null;
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 92f0e277379f..bb58e32c4a7d 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
@@ -66,7 +66,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
   private JCheckBox preferKeyPositionOverCharOption;
 
   private final KeymapSelector myKeymapSelector = new KeymapSelector(this::currentKeymapChanged);
-  private final ActionsTree myActionsTree = new ActionsTree(myKeymapSelector);
+  private final ActionsTree myActionsTree = new ActionsTree();
   private FilterComponent myFilterComponent;
   private TreeExpansionMonitor myTreeExpansionMonitor;
   private final ShortcutFilteringPanel myFilteringPanel = new ShortcutFilteringPanel();
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapSelector.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapSelector.java
index 201ed45a1511..26857d38c6be 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapSelector.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapSelector.java
@@ -250,7 +250,7 @@ final class KeymapSelector extends SimpleSchemesPanel<Keymap> implements Schemes
 
   @Override
   protected boolean highlightNonDefaultSchemes() {
-    return true;
+    return false;
   }
 
   @Override