diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 85d6c2b059..4986065d4d 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -115,10 +115,14 @@ select_swatch (GtkColorChooserWidget *cc,
   gtk_widget_queue_draw (GTK_WIDGET (cc->priv->current));
 
   gtk_color_swatch_get_rgba (swatch, &color);
+
   g_settings_set (cc->priv->settings, "selected-color", "(bdddd)",
                   TRUE, color.red, color.green, color.blue, color.alpha);
 
-  g_object_notify (G_OBJECT (cc), "rgba");
+  if (gtk_widget_get_visible (GTK_WIDGET (cc->priv->editor)))
+    gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cc->priv->editor), &color);
+  else
+    g_object_notify (G_OBJECT (cc), "rgba");
 }
 
 static void