diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp
index 669ed82e4f33..064230439a4d 100644
--- a/scene/gui/grid_container.cpp
+++ b/scene/gui/grid_container.cpp
@@ -40,8 +40,6 @@ void GridContainer::_notification(int p_what) {
 
 			int hsep = get_constant("hseparation");
 			int vsep = get_constant("vseparation");
-			int max_col = MIN(get_child_count(), columns);
-			int max_row = ceil((float)get_child_count() / (float)columns);
 
 			// Compute the per-column/per-row data.
 			int valid_controls_index = 0;
@@ -78,6 +76,9 @@ void GridContainer::_notification(int p_what) {
 				}
 			}
 
+			int max_col = MIN(valid_controls_index, columns);
+			int max_row = ceil((float)valid_controls_index / (float)columns);
+
 			// Consider all empty columns expanded.
 			for (int i = valid_controls_index; i < columns; i++) {
 				col_expanded.insert(i);