diff --git a/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp b/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
index 791a704db1e..60c638f75c2 100644
--- a/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/tagtextitem.cpp
@@ -122,8 +122,14 @@ QPointF TagTextItem::movePoint() const
 
 void TagTextItem::setTextMaxWidth(qreal width)
 {
-    m_maxWidth = width;
     QTextOption opt = m_textItem->document()->defaultTextOption();
+    if (width < 0 || width >= this->boundingRect().width() || m_textItem->toPlainText().isEmpty()) {
+        m_textItem->setTextWidth(-1);
+        opt.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
+        return;
+    }
+
+    m_maxWidth = width;
     opt.setWrapMode(QTextOption::WordWrap);
     m_textItem->document()->setDefaultTextOption(opt);
     m_textItem->setTextWidth(m_maxWidth);