diff --git a/libs/ui/source/grid_layout.cpp b/libs/ui/source/grid_layout.cpp
index 05cffc87..b6ff7438 100644
--- a/libs/ui/source/grid_layout.cpp
+++ b/libs/ui/source/grid_layout.cpp
@@ -51,12 +51,12 @@ namespace psemek::ui
 
 	void grid_layout::set_row_count(std::size_t count)
 	{
-		set_size(count, column_count());
+		set_size(count, std::max<std::size_t>(1, column_count()));
 	}
 
 	void grid_layout::set_column_count(std::size_t count)
 	{
-		set_size(row_count(), count);
+		set_size(std::max<std::size_t>(1, row_count()), count);
 	}
 
 	void grid_layout::set_size(std::size_t rows, std::size_t columns)