From 12644c13ff915487a235fe90960fc4ecbbb23946 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Mon, 6 Oct 2014 14:19:18 +0400
Subject: [PATCH] IDEA-130812 Settings / Keymap: custom scheme is shown
 selected, but all shortcuts are from Default (regression)

---
 .../options/newEditor/SpotlightPainter.java   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SpotlightPainter.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SpotlightPainter.java
index 374b4d10374d..61dc1deae6a1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SpotlightPainter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SpotlightPainter.java
@@ -80,19 +80,17 @@ abstract class SpotlightPainter extends AbstractPainter {
       myGlassPanel.clear();
       String text = filter.getFilterText();
       myVisible = !text.isEmpty();
-      if (myVisible) {
-        try {
-          SearchableConfigurable searchable = new SearchableConfigurable.Delegate(configurable);
-          SearchUtil.lightOptions(searchable, component, text, myGlassPanel).run();
-          Runnable search = searchable.enableSearch(text);
-          if (search != null && !filter.contains(configurable) && !text.equals(myConfigurableOption.get(configurable))) {
-            search.run();
-          }
-        }
-        finally {
-          myConfigurableOption.put(configurable, text);
+      try {
+        SearchableConfigurable searchable = new SearchableConfigurable.Delegate(configurable);
+        SearchUtil.lightOptions(searchable, component, text, myGlassPanel).run();
+        Runnable search = searchable.enableSearch(text); // execute for empty string too
+        if (search != null && !filter.contains(configurable) && !text.equals(myConfigurableOption.get(configurable))) {
+          search.run();
         }
       }
+      finally {
+        myConfigurableOption.put(configurable, text);
+      }
     }
     else if (!ApplicationManager.getApplication().isUnitTestMode()) {
       updateLater();