diff --git a/internal/display/bufwindow.go b/internal/display/bufwindow.go
index 885ccae89c..a440dcd07b 100644
--- a/internal/display/bufwindow.go
+++ b/internal/display/bufwindow.go
@@ -620,7 +620,7 @@ func (w *BufWindow) displayBuffer() {
 		wordwidth := 0
 
 		totalwidth := w.StartCol - nColsBeforeStart
-		for len(line) > 0 {
+		for len(line) > 0 && vloc.X < maxWidth {
 			r, combc, size := util.DecodeCharacter(line)
 			line = line[size:]