diff --git a/ext/AvizExt/viz/location_selection.jl b/ext/AvizExt/viz/location_selection.jl
index 71b528bae..f2af1ac36 100644
--- a/ext/AvizExt/viz/location_selection.jl
+++ b/ext/AvizExt/viz/location_selection.jl
@@ -189,7 +189,7 @@ function ADRIA.viz.decision_matrices!(
     opts[:colorbar_limits] = get(opts, :colorbar_limits, (0.0, 1.0))
 
     n_criteria::Int64 = length(criteria)
-    n_rows = n_cols = ceil(Int64, sqrt(n_criteria + 1))
+    n_rows, n_cols = _calc_gridsize(n_criteria + 1)
     criteria_names = String.(criteria)
     step::Int64 = 1
     s_row = 1