diff --git a/cmd.c b/cmd.c
index a15b445e..8d5fec64 100644
--- a/cmd.c
+++ b/cmd.c
@@ -409,7 +409,7 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
 		if (target != NULL && target[strcspn(target, ":.")] != '\0')
 			flag = CMD_PANE;
 		else
-			flag = CMD_SESSION;
+			flag = CMD_SESSION_PREFERUNATTACHED;
 	}
 
 	targetflags = 0;
@@ -417,6 +417,7 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
 	case CMD_SESSION:
 	case CMD_SESSION_CANFAIL:
 	case CMD_SESSION_PREFERUNATTACHED:
+	case CMD_SESSION_WITHPANE:
 		if (flag == CMD_SESSION_CANFAIL)
 			targetflags |= CMD_FIND_QUIET;
 		if (flag == CMD_SESSION_PREFERUNATTACHED)
diff --git a/tmux.h b/tmux.h
index fc04bfe9..faf5688e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1307,7 +1307,7 @@ enum cmd_entry_flag {
 	CMD_SESSION,
 	CMD_SESSION_CANFAIL,
 	CMD_SESSION_PREFERUNATTACHED,
-	CMD_SESSION_WITHPANE,
+	CMD_SESSION_WITHPANE, /* implies PREFERUNATTACHED */
 
 	CMD_WINDOW,
 	CMD_WINDOW_CANFAIL,