diff --git a/src/StatusQ/Controls/StatusBaseInput.qml b/src/StatusQ/Controls/StatusBaseInput.qml
index b3a8ef89..1c38b9d8 100644
--- a/src/StatusQ/Controls/StatusBaseInput.qml
+++ b/src/StatusQ/Controls/StatusBaseInput.qml
@@ -142,7 +142,7 @@ Item {
                     font.family: Theme.palette.baseFont.name
                     color: Theme.palette.directColor1
                     onCursorRectangleChanged: flick.ensureVisible(cursorRectangle)
-                    wrapMode: TextEdit.NoWrap
+                    wrapMode: statusBaseInput.multiline ? Text.WrapAtWordBoundaryOrAnywhere : TextEdit.NoWrap
 
                     Keys.onReturnPressed: {
                         if (multiline) {