diff --git a/cmd-find.c b/cmd-find.c
index 15dfa596..9b1ca517 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -931,10 +931,11 @@ cmd_find_target(struct cmd_find_state *fs, struct cmd_q *cmdq,
 	cmd_find_clear_state(fs, cmdq, flags);
 
 	/* Find current state. */
-	fs->current = NULL;
 	if (server_check_marked() && (flags & CMD_FIND_DEFAULT_MARKED))
 		fs->current = &marked_pane;
-	if (fs->current == NULL) {
+	else if (cmd_find_valid_state(&cmdq->current))
+		fs->current = &cmdq->current;
+	else {
 		cmd_find_clear_state(&current, cmdq, flags);
 		if (cmd_find_current_session(&current) != 0) {
 			if (~flags & CMD_FIND_QUIET)