diff --git a/kdecore/localization/kuitsemantics.cpp b/kdecore/localization/kuitsemantics.cpp
index 81c03ac0..ab29766f 100644
--- a/kdecore/localization/kuitsemantics.cpp
+++ b/kdecore/localization/kuitsemantics.cpp
@@ -122,7 +122,7 @@ QString KuitSemantics::format(const QString &text, const QString &ctxt) const
         int tagstartpos = result.indexOf(startformat);
         // qDebug() << Q_FUNC_INFO << format.tag << tagstartpos;
         while (tagstartpos >= 0) {
-            const int tagendpos = result.indexOf(endformat, tagstartpos);
+            const int tagendpos = result.indexOf(endformat, tagstartpos + startformat.size());
             if (Q_LIKELY(tagendpos >= tagstartpos)) {
                 const QString tagvalue = result.mid(tagstartpos + startformat.size(), tagendpos - tagstartpos - startformat.size());
                 // qDebug() << Q_FUNC_INFO << "tagvalue" << format.tag << tagvalue << tagstartpos << tagendpos;
diff --git a/kdecore/localization/kuitsemantics_p.h b/kdecore/localization/kuitsemantics_p.h
index 6cb8f5c3..cab825d5 100644
--- a/kdecore/localization/kuitsemantics_p.h
+++ b/kdecore/localization/kuitsemantics_p.h
@@ -35,8 +35,8 @@ struct KuitFormat
   * @internal
   * (used by KLocalizedString)
   *
-  * KuitSemantics resolves semantic markup in user interface text
-  * into appropriate visual formatting.
+  * KuitSemantics resolves semantic markup in user interface text into appropriate visual
+  * formatting.
   *
   * @author Ivailo Monev <xakepa10@gmail.com>
   * @short class for formatting semantic markup in UI messages