diff --git a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
index bdcdc32b92ed..b2a83c7e3962 100644
--- a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
+++ b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
@@ -95,7 +95,7 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
   };
 
   public ColorPicker(@NotNull Disposable parent, @Nullable Color color, boolean enableOpacity) {
-    this(parent, color, true, enableOpacity, Collections.<ColorPickerListener>emptyList(), false);
+    this(parent, color, true, enableOpacity, Collections.emptyList(), false);
   }
 
   private ColorPicker(Disposable parent,
@@ -1051,7 +1051,10 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
   }
 
   private static class DefaultColorPipette extends ColorPipetteBase {
-
+    private static final int SIZE = 30;
+    private static final int DIALOG_SIZE = SIZE - 4;
+    private static final Point HOT_SPOT = new Point(DIALOG_SIZE / 2, DIALOG_SIZE / 2);
+    
     private final Rectangle myCaptureRect = new Rectangle(-4, -4, 8, 8);
     private final Rectangle myZoomRect = new Rectangle(0, 0, SIZE, SIZE);
     private final Point myPreviousLocation = new Point();
@@ -1072,6 +1075,11 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
       });
     }
 
+    @Override
+    protected Color getPixelColor(Point location) {
+      return super.getPixelColor(new Point(location.x - HOT_SPOT.x + SIZE / 2, location.y - HOT_SPOT.y + SIZE / 2));
+    }
+
     @Override
     public Dialog show() {
       Dialog picker = super.show();
diff --git a/platform/platform-impl/src/com/intellij/ui/picker/ColorPipetteBase.java b/platform/platform-impl/src/com/intellij/ui/picker/ColorPipetteBase.java
index 2e7e8314622c..247cfc0f946c 100644
--- a/platform/platform-impl/src/com/intellij/ui/picker/ColorPipetteBase.java
+++ b/platform/platform-impl/src/com/intellij/ui/picker/ColorPipetteBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,10 +31,6 @@ import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
 
 public abstract class ColorPipetteBase implements ColorPipette {
-  protected static final int SIZE = 30;
-  protected static final int DIALOG_SIZE = SIZE - 4;
-  protected static final Point HOT_SPOT = new Point(DIALOG_SIZE/2, DIALOG_SIZE/2);
-
   private final Alarm myColorListenersNotifier = new Alarm(Alarm.ThreadToUse.SWING_THREAD, this);
   protected final JComponent myParent;
   private final ColorListener myColorListener;
@@ -63,21 +59,15 @@ public abstract class ColorPipetteBase implements ColorPipette {
     setInitialColor(pixelColor);
   }
 
-  protected Color getPixelColor(Point mouseLocation) {
-    Color result = null;
+  protected Color getPixelColor(Point location) {
     if (SystemInfo.isMac) {
-      BufferedImage image = MacColorPipette.captureScreen(myPickerFrame, new Rectangle(mouseLocation.x - HOT_SPOT.x + SIZE / 2,
-                                                                              mouseLocation.y - HOT_SPOT.y + SIZE / 2, 1, 1));
+      BufferedImage image = MacColorPipette.captureScreen(myPickerFrame, new Rectangle(location.x, location.y, 1, 1));
       if (image != null) {
         //noinspection UseJBColor
-        result = new Color(image.getRGB(0, 0));
+        return new Color(image.getRGB(0, 0));
       }
     }
-    if (result == null) {
-      result =
-        myRobot.getPixelColor(mouseLocation.x - HOT_SPOT.x + SIZE / 2 , mouseLocation.y - HOT_SPOT.y + SIZE / 2 );
-    }
-    return result;
+    return myRobot.getPixelColor(location.x, location.y);
   }
 
   @Nullable
@@ -114,12 +104,12 @@ public abstract class ColorPipetteBase implements ColorPipette {
     PointerInfo pointerInfo = MouseInfo.getPointerInfo();
     if (pointerInfo == null) return null;
 
-    Point mouseLoc = pointerInfo.getLocation();
+    Point mouseLocation = pointerInfo.getLocation();
     Dialog pickerDialog = getPickerDialog();
-    if (pickerDialog != null) {
-      pickerDialog.setLocation(mouseLoc.x - HOT_SPOT.x, mouseLoc.y - HOT_SPOT.y);
+    if (pickerDialog != null && mouseLocation != null) {
+      pickerDialog.setLocation(mouseLocation.x - pickerDialog.getWidth() / 2, mouseLocation.y - pickerDialog.getHeight() / 2);
     }
-    return mouseLoc;
+    return mouseLocation;
   }
 
   @Nullable