1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
index be359cc2ff..cf4c8c8b74 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
@@ -464,8 +464,8 @@ public abstract class AbstractColorPicker extends AbstractField<Color> {
                 window.addCloseListener(
                         event -> getState().popupVisible = false);
                 window.addValueChangeListener(event -> {
-                    setValue(event.getValue());
-                    rpc.changeColor(event.getValue().getCSS());
+                    window.setValue(color);
+                    setValue(event.getValue(), true);
                 });
                 window.getHistory().setValue(color);
                 window.setPositionX(positionX);