diff --git a/src/cmd.c b/src/cmd.c
index d67096b61..d46119f07 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -3917,6 +3917,9 @@ rhack(char *cmd)
             goto do_cmdq_extcmd;
     } else if (firsttime) {
         cmd = parse();
+        /* parse() pushed a cmd but didn't return any key */
+        if (!*cmd && g.command_queue)
+            goto got_prefix_input;
     }
 
     if (*cmd == g.Cmd.spkeys[NHKF_ESC]) {