diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index be954a2..3e1ef00 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -296,6 +296,12 @@ remove_palette (GtkColorChooserWidget *cc)
   GList *children, *l;
   GtkWidget *widget;
 
+  if (cc->priv->current != NULL)
+    {
+      gtk_widget_unset_state_flags (GTK_WIDGET (cc->priv->current), GTK_STATE_FLAG_SELECTED);
+      cc->priv->current = NULL;
+    }
+
   children = gtk_container_get_children (GTK_CONTAINER (cc->priv->palette));
   for (l = children; l; l = l->next)
     {
