diff --git a/src/nano.c b/src/nano.c
index 6758b196..94179331 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2548,7 +2548,7 @@ int main(int argc, char **argv)
 
 		as_an_at = TRUE;
 
-		if (refresh_needed && (LINES > 1 || lastmessage == VACUUM))
+		if ((refresh_needed && LINES > 1) || (LINES == 1 && lastmessage <= HUSH))
 			edit_refresh();
 		else
 			place_the_cursor();
diff --git a/src/winio.c b/src/winio.c
index b7653530..1933a700 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -182,10 +182,6 @@ void read_keys_from(WINDOW *win)
 	bool timed = FALSE;
 #endif
 
-	/* On a one-row terminal, overwrite an unimportant message. */
-	if (LINES == 1 && currmenu == MMAIN && lastmessage == HUSH)
-		edit_refresh();
-
 	/* Before reading the first keycode, display any pending screen updates. */
 	doupdate();