diff --git a/src/mainclient/shell.c b/src/mainclient/shell.c
index 1ef3fd5c..9b736627 100644
--- a/src/mainclient/shell.c
+++ b/src/mainclient/shell.c
@@ -620,8 +620,12 @@ static int line() {
                 clearlines();
                 return -1;
             case 4:     /* ctrl-d, eof */
-                clearlines();
-                return -1;
+                if (gbl_len == 0) {   /* quit on empty line */
+                    clearlines();
+                    return -1;
+                } 
+                kdelete(1);
+                break;
             case 5:     /* ctrl-e */
                 gbl_pos = gbl_len;
                 refresh();