1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
index 6ab1ac1ccb..e51d03c5e0 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
+++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
@@ -38,7 +38,7 @@ public class ColorPickerGrid extends AbstractField<Color> {
 
         @Override
         public void select(int x, int y) {
-            Color oldValue = colorGrid[x][y];
+            Color oldValue = colorGrid[y][x];
             ColorPickerGrid.this.x = x;
             ColorPickerGrid.this.y = y;
             fireEvent(new ValueChangeEvent<>(ColorPickerGrid.this, oldValue,
@@ -195,12 +195,12 @@ public class ColorPickerGrid extends AbstractField<Color> {
 
     @Override
     public Color getValue() {
-        return colorGrid[x][y];
+        return colorGrid[y][x];
     }
 
     @Override
     protected void doSetValue(Color color) {
-        colorGrid[x][y] = color;
+        colorGrid[y][x] = color;
         changedColors.put(new Point(x, y), color);
         sendChangedColors();
     }