diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs
index 2a564b6a2c..5c4312f51b 100644
--- a/src/Avalonia.Controls/Grid.cs
+++ b/src/Avalonia.Controls/Grid.cs
@@ -726,6 +726,7 @@ namespace Avalonia.Controls
                     double newsize = segmentSize;
                     newsize += contribution * (type == GridUnitType.Star ? matrix[i, i].Stars : 1);
                     newsize = Math.Min(newsize, matrix[i, i].Max);
+                    newsize = Math.Max(newsize, matrix[i, i].Min);
                     assigned |= newsize > segmentSize;
                     size -= newsize - segmentSize;