diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index 3d63440e..e660cfb3 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -77,6 +77,8 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
 			free(cause);
 			return (CMD_RETURN_ERROR);
 		}
+		if (args_has(args, 'X') || args->argc == 0)
+			wp->modeprefix = np;
 	}
 
 	if (args_has(args, 'X')) {
@@ -84,7 +86,6 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
 			cmdq_error(item, "not in a mode");
 			return (CMD_RETURN_ERROR);
 		}
-		wp->modeprefix = np;
 		if (!m->valid)
 			wp->mode->command(wp, c, s, args, NULL);
 		else