diff --git a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
index 534e852eeb8b..b8405b872629 100644
--- a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
+++ b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
@@ -150,7 +150,8 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
 
   private JTextField createColorField(boolean hex) {
     final NumberDocument doc = new NumberDocument(hex);
-    final JTextField field = new JTextField(doc, "", hex ? 5:2);
+    final int lafFix = UIUtil.isUnderWindowsClassicLookAndFeel() || UIUtil.isUnderWindowsLookAndFeel() ? 1 : 0;
+    final JTextField field = new JTextField(doc, "", (hex ? 5:2) + lafFix);
     field.setSize(50, -1);
     doc.setSource(field);
     field.getDocument().addDocumentListener(this);