===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -c -r1.71 -r1.72
*** src/usr.bin/tmux/cmd-find.c	2019/03/15 15:20:00	1.71
--- src/usr.bin/tmux/cmd-find.c	2019/05/08 18:05:03	1.72
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.71 2019/03/15 15:20:00 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.72 2019/05/08 18:05:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1040,1051 ****
  		switch (type) {
  		case CMD_FIND_PANE:
  			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
! 			if (fs->wp != NULL)
  				fs->w = fs->wl->window;
! 			break;
  		case CMD_FIND_WINDOW:
  		case CMD_FIND_SESSION:
  			fs->wl = cmd_mouse_window(m, &fs->s);
  			if (fs->wl != NULL) {
  				fs->w = fs->wl->window;
  				fs->wp = fs->w->active;
--- 1040,1055 ----
  		switch (type) {
  		case CMD_FIND_PANE:
  			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
! 			if (fs->wp != NULL) {
  				fs->w = fs->wl->window;
! 				break;
! 			}
! 			/* FALLTHROUGH */
  		case CMD_FIND_WINDOW:
  		case CMD_FIND_SESSION:
  			fs->wl = cmd_mouse_window(m, &fs->s);
+ 			if (fs->wl == NULL && fs->s != NULL)
+ 				fs->wl = fs->s->curw;
  			if (fs->wl != NULL) {
  				fs->w = fs->wl->window;
  				fs->wp = fs->w->active;