diff --git a/src/terminal.go b/src/terminal.go
index 53a327697d9..9f1f9056b53 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -1087,7 +1087,7 @@ func (t *Terminal) printItem(result Result, line int, i int, current bool) {
 		return
 	}
 
-	t.move(line, 0, false)
+	t.move(line, 0, true)
 	if current {
 		if len(label) == 0 {
 			t.window.CPrint(tui.ColCurrentCursorEmpty, t.pointerEmpty)
@@ -1113,10 +1113,6 @@ func (t *Terminal) printItem(result Result, line int, i int, current bool) {
 		}
 		newLine.width = t.printHighlighted(result, tui.ColNormal, tui.ColMatch, false, true)
 	}
-	fillSpaces := prevLine.width - newLine.width
-	if fillSpaces > 0 {
-		t.window.Print(strings.Repeat(" ", fillSpaces))
-	}
 	t.prevLines[i] = newLine
 }
 
diff --git a/src/tui/light.go b/src/tui/light.go
index a1234166328..d333e06094c 100644
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -944,7 +944,7 @@ func (w *LightWindow) Fill(text string) FillReturn {
 }
 
 func (w *LightWindow) CFill(fg Color, bg Color, attr Attr, text string) FillReturn {
-	w.Move(w.posy, w.posx)
+	w.MoveAndClear(w.posy, w.posx)
 	if fg == colDefault {
 		fg = w.fg
 	}