diff --git a/libs/ui/include/psemek/ui/element_factory.hpp b/libs/ui/include/psemek/ui/element_factory.hpp
index 25248321..dbda4687 100644
--- a/libs/ui/include/psemek/ui/element_factory.hpp
+++ b/libs/ui/include/psemek/ui/element_factory.hpp
@@ -30,7 +30,7 @@ namespace psemek::ui
 		virtual std::shared_ptr<button> make_button();
 		virtual std::shared_ptr<button> make_button(std::string text);
 		virtual std::shared_ptr<button> make_button(gfx::texture_view_2d icon);
-		virtual std::shared_ptr<label> make_label(std::string text);
+		virtual std::shared_ptr<label> make_label(std::string text, bool tagged = false);
 		virtual std::shared_ptr<frame> make_frame();
 		virtual std::shared_ptr<window> make_window(std::string caption);
 		virtual std::shared_ptr<screen> make_screen();
diff --git a/libs/ui/source/element_factory.cpp b/libs/ui/source/element_factory.cpp
index e81ff185..24643858 100644
--- a/libs/ui/source/element_factory.cpp
+++ b/libs/ui/source/element_factory.cpp
@@ -47,9 +47,14 @@ namespace psemek::ui
 		return b;
 	}
 
-	std::shared_ptr<label> element_factory::make_label(std::string text)
+	std::shared_ptr<label> element_factory::make_label(std::string text, bool tagged)
 	{
-		return std::make_shared<label>(std::move(text));
+		auto result = std::make_shared<label>();
+		if (tagged)
+			result->set_tagged_text(std::move(text));
+		else
+			result->set_text(std::move(text));
+		return result;
 	}
 
 	std::shared_ptr<frame> element_factory::make_frame() { return nullptr; }