diff -Nru tmux-next-2.3~20161210~bzr3631+20/cmd-send-keys.c tmux-next-2.3~20161212~bzr3632+20/cmd-send-keys.c
--- tmux-next-2.3~20161210~bzr3631+20/cmd-send-keys.c	2016-12-10 12:47:32.000000000 +0000
+++ tmux-next-2.3~20161212~bzr3632+20/cmd-send-keys.c	2016-12-12 07:47:08.000000000 +0000
@@ -77,6 +77,8 @@
 			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 @@
 			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
diff -Nru tmux-next-2.3~20161210~bzr3631+20/debian/bzr-builder.manifest tmux-next-2.3~20161212~bzr3632+20/debian/bzr-builder.manifest
--- tmux-next-2.3~20161210~bzr3631+20/debian/bzr-builder.manifest	2016-12-10 12:47:38.000000000 +0000
+++ tmux-next-2.3~20161212~bzr3632+20/debian/bzr-builder.manifest	2016-12-12 07:47:11.000000000 +0000
@@ -1,3 +1,3 @@
-# bzr-builder format 0.3 deb-version {debupstream}~20161210~bzr3631+20-1ubuntu1~ppa0
-lp:~pi-rho/tmux/master revid:git-v1:a64b7cfe5d20b6193d58903b0ee82aed412071a3
+# bzr-builder format 0.3 deb-version {debupstream}~20161212~bzr3632+20-1ubuntu1~ppa0
+lp:~pi-rho/tmux/master revid:git-v1:dda701d95fd539d7af8f76a8fe9d9cf71691b79a
 merge packaging lp:~pi-rho/tmux/tmux-next-packaging revid:ubuntu@tyr.cx-20160424184113-etlzkc9epit8dmfx
diff -Nru tmux-next-2.3~20161210~bzr3631+20/debian/changelog tmux-next-2.3~20161212~bzr3632+20/debian/changelog
--- tmux-next-2.3~20161210~bzr3631+20/debian/changelog	2016-12-10 12:47:38.000000000 +0000
+++ tmux-next-2.3~20161212~bzr3632+20/debian/changelog	2016-12-12 07:47:11.000000000 +0000
@@ -1,8 +1,8 @@
-tmux-next (2.3~20161210~bzr3631+20-1ubuntu1~ppa0~ubuntu15.10.1) wily; urgency=low
+tmux-next (2.3~20161212~bzr3632+20-1ubuntu1~ppa0~ubuntu15.10.1) wily; urgency=low
 
   * Auto build.
 
- -- pi-rho <ubuntu@tyr.cx>  Sat, 10 Dec 2016 12:47:38 +0000
+ -- pi-rho <ubuntu@tyr.cx>  Mon, 12 Dec 2016 07:47:11 +0000
 
 tmux-next (2.3-1~ppa1~uuu) UNRELEASED; urgency=medium