diff --git a/cmd-find.c b/cmd-find.c
index d2ebd988..a938276e 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -482,8 +482,8 @@ cmd_find_get_window(struct cmd_find_state *fs, const char *window)
 	if (cmd_find_get_window_with_session(fs, window) == 0)
 		return (0);
 
-	/* Try as a session if it looks like a session. */
-	if (*window == '$' && cmd_find_get_session(fs, window) == 0) {
+	/* Otherwise try as a session itself. */
+	if (cmd_find_get_session(fs, window) == 0) {
 		fs->wl = fs->s->curw;
 		fs->w = fs->wl->window;
 		if (~fs->flags & CMD_FIND_WINDOW_INDEX)
@@ -673,8 +673,8 @@ cmd_find_get_pane(struct cmd_find_state *fs, const char *pane)
 	if (cmd_find_get_pane_with_window(fs, pane) == 0)
 		return (0);
 
-	/* Try as a window if it looks like a window. */
-	if (*pane == '@' && cmd_find_get_window(fs, pane) == 0) {
+	/* Otherwise try as a window itself (this will also try as session). */
+	if (cmd_find_get_window(fs, pane) == 0) {
 		fs->wp = fs->w->active;
 		return (0);
 	}