diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 6fa51b9c73..64395cdf43 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3264,10 +3264,11 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
 
       gtk_icon_view_queue_layout (icon_view);
     }
-  else
-    gtk_widget_queue_resize (GTK_WIDGET (icon_view));
 
   g_object_notify (G_OBJECT (icon_view), "model");  
+
+  if (GTK_WIDGET_REALIZE (icon_view))
+    gtk_widget_queue_resize (GTK_WIDGET (icon_view));
 }
 
 /**