diff --git a/ui/messages/textbase.go b/ui/messages/textbase.go
index f44d5d5..c241c0a 100644
--- a/ui/messages/textbase.go
+++ b/ui/messages/textbase.go
@@ -72,18 +72,14 @@ func (msg *BaseTextMessage) calculateBufferWithText(text tstring.TString, width
 				}
 
 				matches := boundaryPattern.FindAllStringIndex(extract.String(), -1)
-				if len(matches) == 0 {
-					continue
-				}
-
-				match := matches[len(matches)-1]
-				if len(match) < 2 {
-					continue
-				}
-
-				until := match[1]
-				if until < len(extract) {
-					extract = extract[:until]
+				if len(matches) > 0 {
+					match := matches[len(matches)-1]
+					if len(match) >= 2 {
+						until := match[1]
+						if until < len(extract) {
+							extract = extract[:until]
+						}
+					}
 				}
 			}
 			msg.buffer = append(msg.buffer, extract)