diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c
index f4278bf3b..76289a7f1 100644
--- a/clutter/clutter-table-layout.c
+++ b/clutter/clutter-table-layout.c
@@ -859,6 +859,9 @@ calculate_col_widths (ClutterTableLayout *self,
               columns[i].visible = TRUE;
               priv->visible_cols += 1;
             }
+
+          if (!columns[i].expand)
+            columns[i].expand = meta->x_fill;
         }
       min_width += priv->col_spacing * (meta->col_span - 1);
       pref_width += priv->col_spacing * (meta->col_span - 1);
@@ -1134,6 +1137,9 @@ calculate_row_heights (ClutterTableLayout *self,
               rows[i].visible = TRUE;
               priv->visible_rows += 1;
             }
+
+          if (!rows[i].expand)
+            rows[i].expand = meta->y_fill;
         }
 
       min_height += priv->row_spacing * (meta->row_span - 1);