diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c
index d3eeee037d..de314c16ba 100644
--- a/gtk/gtkcoloreditor.c
+++ b/gtk/gtkcoloreditor.c
@@ -209,7 +209,9 @@ popup_edit (GtkWidget      *widget,
       focus = editor->priv->a_entry;
     }
 
-  if (popup)
+  if (popup == editor->priv->current_popup)
+    dismiss_current_popup (editor);
+  else if (popup)
     {
       dismiss_current_popup (editor);
       toplevel = gtk_widget_get_toplevel (GTK_WIDGET (editor));