1 files changed, 10 insertions, 10 deletions
diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/ColorSelectionComponent.java b/platform/lang-impl/src/com/intellij/ui/tabs/ColorSelectionComponent.java
index a7721a8b826f..bfa1e14ec88e 100644
--- a/platform/lang-impl/src/com/intellij/ui/tabs/ColorSelectionComponent.java
+++ b/platform/lang-impl/src/com/intellij/ui/tabs/ColorSelectionComponent.java
@@ -96,24 +96,24 @@ public class ColorSelectionComponent extends JPanel {
   }
 
   @Nullable
-  private ColorButton getSelectedButtonInner() {
+  public String getSelectedColorName() {
     for (String name : myColorToButtonMap.keySet()) {
       ColorButton button = myColorToButtonMap.get(name);
-      if (button.isSelected()) return button;
+      if (!button.isSelected()) continue;
+      if (button instanceof CustomColorButton) return ColorUtil.toHex(button.getColor());
+      return name;
     }
     return null;
   }
 
   @Nullable
-  public String getSelectedColorName() {
-    ColorButton button = getSelectedButtonInner();
-    return button == null? null : button instanceof CustomColorButton ? ColorUtil.toHex(button.getColor()) : button.getText();
-  }
-
-  @Nullable
   public Color getSelectedColor() {
-    ColorButton button = getSelectedButtonInner();
-    return button == null? null : button.getColor();
+    for (String name : myColorToButtonMap.keySet()) {
+      ColorButton button = myColorToButtonMap.get(name);
+      if (!button.isSelected()) continue;
+      return button.getColor();
+    }
+    return null;
   }
 
   public void initDefault(@NotNull FileColorManager manager, @Nullable String selectedColorName) {