diff --git a/win/tty/getline.c b/win/tty/getline.c
index 4a2d8c251..1e4e6c43f 100644
--- a/win/tty/getline.c
+++ b/win/tty/getline.c
@@ -60,9 +60,19 @@ getlin_hook_proc hook;
 		Strcat(strcat(strcpy(toplines, query), " "), obufp);
 		c = pgetchar();
 		if (c == '\033' || c == EOF) {
-		    obufp[0] = '\033';
-		    obufp[1] = '\0';
-		    break;
+		    if (c == '\033' && obufp[0] != '\0') {
+			obufp[0] = '\0';
+			bufp = obufp;
+			tty_clear_nhwindow(WIN_MESSAGE);
+			cw->maxcol = cw->maxrow;
+			addtopl(query);
+			addtopl(" ");
+			addtopl(obufp);
+		    } else {
+			obufp[0] = '\033';
+			obufp[1] = '\0';
+			break;
+		    }
 		}
 		if (ttyDisplay->intr) {
 		    ttyDisplay->intr--;