diff --git a/src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs b/src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs index 297e43a3cb73..9fb91746991e 100644 --- a/src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs +++ b/src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs @@ -152,7 +152,7 @@ private double ItemWidth private static int CalculateColumns(double containerWidth, double itemWidth) { - var columns = (int)Math.Round(containerWidth / itemWidth); + var columns = itemWidth > 0 ? (int)Math.Round(containerWidth / itemWidth) : 0; if (columns == 0) { columns = 1; diff --git a/src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.cs b/src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.cs index d769f57bde2d..5d17a8ba78da 100644 --- a/src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.cs +++ b/src/Files.App.Controls/AdaptiveGridView/AdaptiveGridView.cs @@ -119,7 +119,7 @@ protected virtual double CalculateItemWidth(double containerWidth) _needContainerMarginForLayout = true; } - return (containerWidth / columns) - itemMargin.Left - itemMargin.Right; + return columns > 0 ? (containerWidth / columns) - itemMargin.Left - itemMargin.Right : 0; } ///