diff --git a/cmd-find.c b/cmd-find.c
index 5ecd4311..da4fe1e5 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -112,7 +112,7 @@ cmd_find_inside_pane(struct client *c)
 		return (NULL);
 
 	RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
-		if (strcmp(wp->tty, c->ttyname) == 0)
+		if (wp->fd != -1 && strcmp(wp->tty, c->ttyname) == 0)
 			break;
 	}
 	if (wp != NULL)
@@ -223,7 +223,7 @@ fail:
 }
 
 /*
- * Find the best winlink for a window (the current if it contains the pane,
+ * Find the best winlink for a window (the current if it contains the window,
  * otherwise the first).
  */
 static int
@@ -920,6 +920,10 @@ cmd_find_from_client(struct cmd_find_state *fs, struct client *c, int flags)
 			cmd_find_log_state(__func__, fs);
 			return (0);
 		}
+		else {
+			log_debug("%s: session $%u does not have pane %%%u",
+			    __func__, s->id, wp->id);
+		}
 	}
 
 	/*