diff --git a/platform/platform-api/src/com/intellij/ui/ColorPicker.java b/platform/platform-api/src/com/intellij/ui/ColorPicker.java
index 79b81723138d..de8ab6de5072 100644
--- a/platform/platform-api/src/com/intellij/ui/ColorPicker.java
+++ b/platform/platform-api/src/com/intellij/ui/ColorPicker.java
@@ -185,7 +185,7 @@ public class ColorPicker extends JPanel implements Consumer<Color>, DocumentList
                         }
 
                         if (color != null) {
-                          updatePreview(color, true);
+                          updatePreview(color, false);
                         }
                       }
                       else {
@@ -256,6 +256,7 @@ public class ColorPicker extends JPanel implements Consumer<Color>, DocumentList
       forEveryKey(new PairFunction<JTextField, Pair<String, String>, Boolean>() {
                     @Override
                     public Boolean fun(JTextField _c, Pair<String, String> pair) {
+                      if (_c.hasFocus()) return true;
                       final String R = Integer.toHexString(c.getRed());
                       final String G = Integer.toHexString(c.getGreen());
                       final String B = Integer.toHexString(c.getBlue());