diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index d1cc8811..25965495 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -835,8 +835,8 @@ void gui_entry_erase(GUI_ENTRY_REC *entry, int size, CUTBUFFER_UPDATE_OP update_
 	}
 
 	if (entry->utf8)
-		while (entry->pos-size-w > 0 &&
-		       i_wcwidth(entry->text[entry->pos-size-w]) == 0) w++;
+		while (entry->pos > size + w && i_wcwidth(entry->text[entry->pos - size - w]) == 0)
+			w++;
 
 	memmove(entry->text + entry->pos - size, entry->text + entry->pos,
 	        (entry->text_len-entry->pos+1) * sizeof(unichar));