diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index e6f836e57..611a46b96 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -233,6 +233,9 @@ clutter_flow_layout_get_preferred_width (ClutterLayoutManager *manager,
                                               16);
     }
 
+  if (children)
+    line_count = 1;
+
   for (l = children; l != NULL; l = l->next)
     {
       ClutterActor *child = l->data;
@@ -379,6 +382,9 @@ clutter_flow_layout_get_preferred_height (ClutterLayoutManager *manager,
                                               16);
     }
 
+  if (children)
+    line_count = 1;
+
   for (l = children; l != NULL; l = l->next)
     {
       ClutterActor *child = l->data;