diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 42c609870f3119b4b4d3086cd33150332fd43a6d..5f79af92c70de0846e6109038d5cd00b2b476693 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3336,11 +3336,14 @@ set_one_cmd_context(xp, buff)
 	    xp->xp_pattern = arg;
 	    break;
 
-	/* Command modifiers: return the argument. */
+	/* Command modifiers: return the argument.
+	 * Also for commands with an argument that is a command. */
 	case CMD_aboveleft:
+	case CMD_argdo:
 	case CMD_belowright:
 	case CMD_botright:
 	case CMD_browse:
+	case CMD_bufdo:
 	case CMD_confirm:
 	case CMD_debug:
 	case CMD_folddoclosed:
@@ -3352,10 +3355,12 @@ set_one_cmd_context(xp, buff)
 	case CMD_leftabove:
 	case CMD_lockmarks:
 	case CMD_rightbelow:
+	case CMD_sandbox:
 	case CMD_silent:
 	case CMD_topleft:
 	case CMD_verbose:
 	case CMD_vertical:
+	case CMD_windo:
 	    return arg;
 
 #ifdef FEAT_SEARCH_EXTRA