diff --git a/components/Segmented/src/EqualPanel.cs b/components/Segmented/src/EqualPanel.cs
index 9e2eb548..415f05df 100644
--- a/components/Segmented/src/EqualPanel.cs
+++ b/components/Segmented/src/EqualPanel.cs
@@ -73,10 +73,10 @@ protected override Size ArrangeOverride(Size finalSize)
     {
         double x = 0;
 
-        // Check if there's more width available - if so, recalculate (e.g. whenever Grid.Column is set to Auto)
+        // Check if there's more (little) width available - if so, set max item width to the maximum possible as we have an almost perfect height.
         if (finalSize.Width > _visibleItemsCount * _maxItemWidth + (Spacing * (_visibleItemsCount - 1)))
         {
-            MeasureOverride(finalSize);
+            _maxItemWidth = (finalSize.Width - (Spacing * (_visibleItemsCount - 1))) / _visibleItemsCount;
         }
 
         var elements = Children.Where(static e => e.Visibility == Visibility.Visible);