diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index 9a8e3db..8fe73ac 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -1762,7 +1762,9 @@ exo_icon_view_get_preferred_width (GtkWidget *widget,
   GList                    *lp;
 
   /* well, this is easy */
-  *minimal_width = *natural_width = priv->width;
+  if (priv->item_width < 0)
+    *minimal_width = priv->width;
+  *natural_width = priv->width;
 
   /* handle the child widgets */
   for (lp = priv->children; lp != NULL; lp = lp->next)
@@ -1784,7 +1786,8 @@ exo_icon_view_get_preferred_height (GtkWidget *widget,
   GList                    *lp;
 
   /* well, this is easy */
-  *natural_height = *minimal_height = priv->height;
+  *minimal_height = priv->height;
+  *natural_height = priv->height;
 
   /* handle the child widgets */
   for (lp = priv->children; lp != NULL; lp = lp->next)