diff --git a/libs/ui/source/grid_layout.cpp b/libs/ui/source/grid_layout.cpp
index 7dc1e64d..08d6ad4a 100644
--- a/libs/ui/source/grid_layout.cpp
+++ b/libs/ui/source/grid_layout.cpp
@@ -66,6 +66,15 @@ namespace psemek::ui
 		std::size_t const old_row_count = row_count();
 		std::size_t const old_column_count = column_count();
 
+		for (std::size_t i = 0; i < old_row_count; ++i)
+		{
+			for (std::size_t j = 0; j < old_column_count; ++j)
+			{
+				if (i >= rows || j >= columns)
+					set(i, j, nullptr);
+			}
+		}
+
 		children_.resize({rows, columns});
 
 		children_range_.resize(rows * columns);