diff --git a/Userland/Libraries/LibGUI/ColorInput.cpp b/Userland/Libraries/LibGUI/ColorInput.cpp
index e15344f6d8e..d65abf4de47 100644
--- a/Userland/Libraries/LibGUI/ColorInput.cpp
+++ b/Userland/Libraries/LibGUI/ColorInput.cpp
@@ -71,9 +71,11 @@ void ColorInput::mouseup_event(MouseEvent& event)
         m_may_be_color_rect_click = false;
         if (is_color_rect_click) {
             auto dialog = GUI::ColorPicker::construct(m_color, window(), m_color_picker_title);
+            dialog->on_color_changed = [this](Gfx::Color color) {
+                set_color(color);
+            };
             dialog->set_color_has_alpha_channel(m_color_has_alpha_channel);
-            if (dialog->exec() == GUI::Dialog::ExecResult::OK)
-                set_color(dialog->color());
+            dialog->exec();
             event.accept();
             return;
         }
diff --git a/Userland/Libraries/LibGUI/ColorPicker.cpp b/Userland/Libraries/LibGUI/ColorPicker.cpp
index 7563da4c7ca..d1cf66e1dfa 100644
--- a/Userland/Libraries/LibGUI/ColorPicker.cpp
+++ b/Userland/Libraries/LibGUI/ColorPicker.cpp
@@ -185,6 +185,7 @@ private:
 
 ColorPicker::ColorPicker(Color color, Window* parent_window, DeprecatedString title)
     : Dialog(parent_window)
+    , m_original_color(color)
     , m_color(color)
 {
     set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/color-chooser.png"sv).release_value_but_fixme_should_propagate_errors());
@@ -230,6 +231,8 @@ void ColorPicker::build_ui()
     auto& ok_button = button_container.add<DialogButton>();
     ok_button.set_text("OK"_short_string);
     ok_button.on_click = [this](auto) {
+        if (on_color_changed)
+            on_color_changed(m_color);
         done(ExecResult::OK);
     };
     ok_button.set_default(true);
@@ -237,6 +240,8 @@ void ColorPicker::build_ui()
     auto& cancel_button = button_container.add<DialogButton>();
     cancel_button.set_text("Cancel"_short_string);
     cancel_button.on_click = [this](auto) {
+        if (on_color_changed)
+            on_color_changed(m_original_color);
         done(ExecResult::Cancel);
     };
 }
@@ -439,6 +444,8 @@ void ColorPicker::update_color_widgets()
     m_alpha_spinbox->set_enabled(m_color_has_alpha_channel);
     m_alpha->set_value(m_color.alpha());
     m_alpha->set_visible(m_color_has_alpha_channel);
+    if (on_color_changed)
+        on_color_changed(m_color);
 }
 
 void ColorPicker::create_color_button(Widget& container, unsigned rgb)
diff --git a/Userland/Libraries/LibGUI/ColorPicker.h b/Userland/Libraries/LibGUI/ColorPicker.h
index f69f3a17e8d..79db518d880 100644
--- a/Userland/Libraries/LibGUI/ColorPicker.h
+++ b/Userland/Libraries/LibGUI/ColorPicker.h
@@ -26,6 +26,7 @@ public:
     bool color_has_alpha_channel() const { return m_color_has_alpha_channel; }
     void set_color_has_alpha_channel(bool);
     Color color() const { return m_color; }
+    Function<void(Color)> on_color_changed;
 
 private:
     explicit ColorPicker(Color, Window* parent_window = nullptr, DeprecatedString title = "Color Picker");
@@ -36,6 +37,7 @@ private:
     void update_color_widgets();
     void create_color_button(Widget& container, unsigned rgb);
 
+    Color m_original_color;
     Color m_color;
     bool m_color_has_alpha_channel { true };