diff --git a/app/color_picker.c b/app/color_picker.c
index d1dfb7a51e..c38ac4be79 100644
--- a/app/color_picker.c
+++ b/app/color_picker.c
@@ -746,6 +746,8 @@ tools_free_color_picker (Tool *tool)
     {
       info_dialog_free (color_picker_info);
       color_picker_info = NULL;
+
+      color_panel_free (color_panel);
       color_panel = NULL;
     }
 
diff --git a/app/tools/color_picker.c b/app/tools/color_picker.c
index d1dfb7a51e..c38ac4be79 100644
--- a/app/tools/color_picker.c
+++ b/app/tools/color_picker.c
@@ -746,6 +746,8 @@ tools_free_color_picker (Tool *tool)
     {
       info_dialog_free (color_picker_info);
       color_picker_info = NULL;
+
+      color_panel_free (color_panel);
       color_panel = NULL;
     }