diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index a4f55102..8f51d0fe 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -61,7 +61,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
 	if ((c = cmd_find_client(item, args_get(args, 'c'), 0)) == NULL)
 		return (CMD_RETURN_ERROR);
 
-	if (tflag != NULL && tflag[strcspn(tflag, ":.")] != '\0') {
+	if (tflag != NULL && tflag[strcspn(tflag, ":.%")] != '\0') {
 		type = CMD_FIND_PANE;
 		flags = 0;
 	} else {
diff --git a/tmux.1 b/tmux.1
index ebbdc5bd..0596da0c 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1096,6 +1096,14 @@ Switch the current session for client
 .Ar target-client
 to
 .Ar target-session .
+As a special case,
+.Fl t
+may refer to a pane (a target that contains
+.Ql : ,
+.Ql .
+or
+.Ql % )
+in which case the session, window and pane are all changed.
 If
 .Fl l ,
 .Fl n