diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/GlassPanel.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/GlassPanel.java
index dd803bba0976..8d7ed8a0e787 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/GlassPanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/GlassPanel.java
@@ -21,6 +21,8 @@ public class GlassPanel extends JComponent {
   private final Set<JComponent> myLightComponents = new HashSet<>();
   private final JComponent myPanel;
   private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);
+  private static final JBColor SPOTLIGHT_BORDER_COLOR = JBColor.namedColor("Settings.Spotlight.borderColor",
+                                                                                   ColorUtil.toAlpha(JBColor.ORANGE, 100));
 
 
   public GlassPanel(JComponent containingPanel) {
@@ -75,7 +77,7 @@ public class GlassPanel extends JComponent {
         g2.fill(mask);
 
         g2.setStroke(new BasicStroke(stroke));
-        g2.setColor(ColorUtil.toAlpha(JBColor.ORANGE, 100));
+        g2.setColor(SPOTLIGHT_BORDER_COLOR);
         g2.draw(mask);
       }
       finally {
diff --git a/platform/platform-resources/src/themes/metadata/IntelliJPlatform.themeMetadata.json b/platform/platform-resources/src/themes/metadata/IntelliJPlatform.themeMetadata.json
index 295477c6f711..99f98858ef5b 100644
--- a/platform/platform-resources/src/themes/metadata/IntelliJPlatform.themeMetadata.json
+++ b/platform/platform-resources/src/themes/metadata/IntelliJPlatform.themeMetadata.json
@@ -622,6 +622,10 @@
     {
       "key": "SearchMatch.startBackground"
     },
+    {
+      "key": "Settings.Spotlight.borderColor",
+      "description": "Color of the border around highlighted items when searching in the Settings dialog"
+    },
     {
       "key": "SidePanel.background",
       "description": "Left-side tree background in the Settings and Project Structure dialogs"