diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 6652ce9193..c376860e87 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -505,8 +505,8 @@ swatch_button_press (GtkWidget      *widget,
       do_popup (widget, event);
       return TRUE;
     }
-  else if (event->button == GDK_BUTTON_PRIMARY &&
-           swatch->priv->selected)
+  else if (event->type == GDK_2BUTTON_PRESS &&
+           event->button == GDK_BUTTON_PRIMARY)
     {
       g_signal_emit (swatch, signals[ACTIVATE], 0);
       return TRUE;