diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 46c39251..98d48121 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -242,6 +242,7 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
 	}
 
         /* clear the rest of the input line */
+	if (xpos < end_xpos) {
         if (end_xpos == term_width)
 		term_clrtoeol(root_window);
 	else {
@@ -250,6 +251,7 @@ static void gui_entry_draw_from(GUI_ENTRY_REC *entry, int pos)
                         xpos++;
 		}
 	}
+	}
 }
 
 static void gui_entry_draw(GUI_ENTRY_REC *entry)