diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index ccee3ea122..2f97f94fc7 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -353,7 +353,14 @@ swatch_get_preferred_width (GtkWidget *widget,
                             gint      *min,
                             gint      *nat)
 {
-  *min = *nat = 48;
+  gint w, h;
+
+  gtk_widget_get_size_request (widget, &w, &h);
+
+  if (w < 0)
+    w = 48;
+
+  *min = *nat = w;
 }
 
 static void
@@ -361,7 +368,14 @@ swatch_get_preferred_height (GtkWidget *widget,
                              gint      *min,
                              gint      *nat)
 {
-  *min = *nat = 32;
+  gint w, h;
+
+  gtk_widget_get_size_request (widget, &w, &h);
+
+  if (h < 0)
+    h = 32;
+
+  *min = *nat = h;
 }
 
 static gboolean