diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc
index 316beb791..7d0f9013b 100644
--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -157,6 +157,8 @@ FilePanel::~FilePanel ()
     if (inspectorPanel) {
         delete inspectorPanel;
     }
+
+    delete tpc;
 }
 
 void FilePanel::on_realize ()
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index e80b2028a..1bb1c23a3 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -199,7 +199,7 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
     Gtk::HBox *riHBox = Gtk::manage ( new Gtk::HBox());
     Gtk::Label* outputIntentLbl = Gtk::manage (new Gtk::Label(M("TP_ICM_PROFILEINTENT")+":"));
     riHBox->pack_start (*outputIntentLbl, Gtk::PACK_SHRINK);
-    ointent = Gtk::manage (new PopUpButton ());
+    ointent.reset (new PopUpButton ());
     ointent->addEntry("intent-perceptual.png", M("PREFERENCES_INTENT_PERCEPTUAL"));
     ointent->addEntry("intent-relative.png", M("PREFERENCES_INTENT_RELATIVE"));
     ointent->addEntry("intent-saturation.png", M("PREFERENCES_INTENT_SATURATION"));
diff --git a/rtgui/icmpanel.h b/rtgui/icmpanel.h
index 0e7deefa9..35017bed4 100644
--- a/rtgui/icmpanel.h
+++ b/rtgui/icmpanel.h
@@ -83,7 +83,7 @@ private:
 
     MyComboBoxText*    onames;
     sigc::connection   onamesconn;
-    PopUpButton*       ointent;
+    std::unique_ptr<PopUpButton>       ointent;
     sigc::connection   ointentconn;
     Gtk::RadioButton*  iunchanged;
     MyFileChooserButton* ipDialog;