diff --git a/src/ui/widget/color-page.cpp b/src/ui/widget/color-page.cpp
index c6cf5c9b03928b0f3e2ffd09bb2835ff31f371e0..64a36a0e6cd49aae0db322b58856e2fccf24ddb0 100644
--- a/src/ui/widget/color-page.cpp
+++ b/src/ui/widget/color-page.cpp
@@ -42,9 +42,6 @@ ColorPage::ColorPage(std::shared_ptr<Space::AnySpace> space, std::shared_ptr<Col
         for (auto &[id, color] : *_specific_colors) {
             _selected_colors->set(id, color);
         }
-        if (_color_wheel && _color_wheel->get_widget().is_drawable()) {
-            _color_wheel->set_color(_specific_colors->getAverage());
-        }
     });
 
     // Keep the child in-sync with the selected colorset.
@@ -53,6 +50,9 @@ ColorPage::ColorPage(std::shared_ptr<Space::AnySpace> space, std::shared_ptr<Col
         for (auto &[id, color] : *_selected_colors) {
             _specific_colors->set(id, color);
         }
+        if (_color_wheel && _color_wheel->get_widget().is_drawable()) {
+            _color_wheel->set_color(_specific_colors->getAverage());
+        }
     });
 
     // Control signals when widget isn't mapped (not visible to the user)
diff --git a/src/ui/widget/color-page.h b/src/ui/widget/color-page.h
index 6a3a2377a11e80624866852bfd949247c2922fea..eb7efc7ffc50dd3b0fed41533c2d76e0039063f5 100644
--- a/src/ui/widget/color-page.h
+++ b/src/ui/widget/color-page.h
@@ -51,7 +51,6 @@ public:
 
     void show_expander(bool show);
     ColorWheel* create_color_wheel(Space::Type type, bool disc);
-    // Gtk::Grid& get_grid();
     void set_spinner_size_pattern(const std::string& pattern);
 
     void attach_page(Glib::RefPtr<Gtk::SizeGroup> first_column, Glib::RefPtr<Gtk::SizeGroup> last_column);
diff --git a/src/ui/widget/paint-selector.cpp b/src/ui/widget/paint-selector.cpp
index 431c069465745ab4c2fe67ef022201b84b9e10d6..a858c807ec24592cff198b0d4c5d7ea0e2491d1b 100644
--- a/src/ui/widget/paint-selector.cpp
+++ b/src/ui/widget/paint-selector.cpp
@@ -407,21 +407,12 @@ void PaintSelector::clear_frame()
     }
 }
 
-// ColorPickerPanel* pp = 0;
-
 void PaintSelector::set_mode_empty()
 {
     set_style_buttons(nullptr);
     _style->set_sensitive(false);
     clear_frame();
     _label->set_markup(_("<b>No objects</b>"));
-
-// if (!pp) {
-//     pp = ColorPickerPanel::create(); // Gtk::make_managed<ColorPlate>();
-//     pp->set_expand();
-//     // pp->set_size_request(520,460);
-//     _frame->append(*pp);
-// }
 }
 
 void PaintSelector::set_mode_multiple()