diff --git a/libs/ui/source/label.cpp b/libs/ui/source/label.cpp
index 933a8901..e9a30880 100644
--- a/libs/ui/source/label.cpp
+++ b/libs/ui/source/label.cpp
@@ -577,7 +577,7 @@ namespace psemek::ui
 					break;
 				case halignment::stretch:
 					offset[0] = bbox[0].min - line_bbox[l][0].min;
-					if ((l + 1 != lines.size() && text_[lines[l].end] != '\n') && spaces > 0)
+					if ((l + 1 != lines.size()) && (lines[l].end >= items.size() || !items[lines[l].end].character || !is_newline(*items[lines[l].end].character)) && spaces > 0)
 						space_extra = (bbox[0].length() - line_bbox[l][0].length()) / spaces;
 					break;
 				}