diff --git a/libs/ui/source/label.cpp b/libs/ui/source/label.cpp
index 0f94c627..2137106a 100644
--- a/libs/ui/source/label.cpp
+++ b/libs/ui/source/label.cpp
@@ -437,7 +437,7 @@ namespace psemek::ui
 
 		{
 			std::size_t current_item = 0;
-			while (current_item < items.size())
+			while (true)
 			{
 				if (skip_spaces_)
 				{
@@ -485,6 +485,9 @@ namespace psemek::ui
 
 				lines.push_back({line_begin, current_item});
 
+				if (current_item == items.size())
+					break;
+
 				if (newline_end)
 					++current_item;
 			}