1 files changed, 2 insertions, 2 deletions

diff --git a/shell/shell_common.c b/shell/shell_common.c
index af05625a4..320cd88fd 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -235,8 +235,8 @@ shell_builtin_read(struct builtin_read_params *params)
                         int64_t key;
 
                         key = read_key(fd, NULL, timeout);
-                        if (key == 0x03 || key == -1) {
-                                /* ^C or timeout */
+                        if (key == 0x03 || key == -1 || (key == 0x1a && bufpos == 0)) {
+                                /* ^C, timeout or ^Z at start of buffer */
                                 retval = (const char *)(uintptr_t)1;
                                 goto ret;
                         }