===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- src/usr.bin/tmux/server-client.c	2018/07/04 12:25:26	1.251
+++ src/usr.bin/tmux/server-client.c	2018/07/16 08:48:22	1.252
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.251 2018/07/04 12:25:26 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.252 2018/07/16 08:48:22 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -907,8 +907,8 @@
 	 * The prefix always takes precedence and forces a switch to the prefix
 	 * table, unless we are already there.
 	 */
-retry:
 	key0 = (key & ~KEYC_XTERM);
+retry:
 	if ((key0 == (key_code)options_get_number(s->options, "prefix") ||
 	    key0 == (key_code)options_get_number(s->options, "prefix2")) &&
 	    strcmp(table->name, "prefix") != 0) {
@@ -980,6 +980,10 @@
 	 * switch the client back to the root table and try again.
 	 */
 	log_debug("not found in key table %s", table->name);
+	if (key0 != KEYC_ANY) {
+		key0 = KEYC_ANY;
+		goto retry;
+	}
 	if (!server_client_is_default_key_table(c, table) ||
 	    (c->flags & CLIENT_REPEAT)) {
 		server_client_set_key_table(c, NULL);