2 files changed, 1 insertions, 13 deletions
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 3e0bf316c..5beb0900b 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -37,7 +37,6 @@ ColorPicker::ColorPicker (const Glib::ustring& title, const Glib::ustring& tip,
     _preview.show();
     add (_preview);
     set_tooltip_text (tip);
-    _parent_dialog = nullptr;
     _selected_color.signal_changed.connect(sigc::mem_fun(this, &ColorPicker::_onSelectedColorChanged));
     _selected_color.signal_dragged.connect(sigc::mem_fun(this, &ColorPicker::_onSelectedColorChanged));
     _selected_color.signal_released.connect(sigc::mem_fun(this, &ColorPicker::_onSelectedColorChanged));
@@ -63,8 +62,6 @@ void ColorPicker::setupDialog(const Glib::ustring &title)
     _color_selector->show();
 }
 
-void ColorPicker::setParentDialog(Gtk::Widget *parent_dialog) { _parent_dialog = parent_dialog; }
-
 void ColorPicker::setSensitive(bool sensitive) { set_sensitive(sensitive); }
 
 void ColorPicker::setRgba32 (guint32 rgba)
@@ -94,18 +91,11 @@ void ColorPicker::on_clicked()
         _selected_color.setValue(_rgba);
         _updating = false;
     }
-    Gtk::Window *originalwindow = dynamic_cast<Gtk::Window *>(_parent_dialog->get_toplevel());
-    if (originalwindow) {
-        originalwindow->hide();
-    }
     _colorSelectorDialog.show();
-    Glib::RefPtr<Gdk::Window> window = get_parent_window();
+    Glib::RefPtr<Gdk::Window> window = _colorSelectorDialog.get_parent_window();
     if (window) {
         window->focus(1);
     }
-    if (originalwindow) {
-        originalwindow->show();
-    }
 }
 
 void ColorPicker::on_changed (guint32)
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index ffe9ef2e0..b98f832dd 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -48,7 +48,6 @@ public:
     void setRgba32 (guint32 rgba);
     void setSensitive(bool sensitive);
     void closeWindow();
-    void setParentDialog(Gtk::Widget *parent_dialog);
     sigc::connection connectChanged (const sigc::slot<void,guint>& slot)
         { return _changed_signal.connect (slot); }
 
@@ -71,7 +70,6 @@ protected:
     //Inkscape::UI::Dialog::Dialog _colorSelectorDialog;
     Gtk::Dialog _colorSelectorDialog;
     SelectedColor _selected_color;
-    Gtk::Widget *_parent_dialog;
     Gtk::Widget *_color_selector;
 };