===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-pane.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -c -r1.43 -r1.44
*** src/usr.bin/tmux/cmd-select-pane.c	2018/05/20 11:48:34	1.43
--- src/usr.bin/tmux/cmd-select-pane.c	2018/06/25 17:23:16	1.44
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-pane.c,v 1.43 2018/05/20 11:48:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-select-pane.c,v 1.44 2018/06/25 17:23:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 69,74 ****
--- 69,79 ----
  
  	if (self->entry == &cmd_last_pane_entry || args_has(args, 'l')) {
  		lastwp = w->last;
+ 		if (lastwp == NULL && window_count_panes(w) == 2) {
+ 			lastwp = TAILQ_PREV(w->active, window_panes, entry);
+ 			if (lastwp == NULL)
+ 				lastwp = TAILQ_NEXT(w->active, entry);
+ 		}
  		if (lastwp == NULL) {
  			cmdq_error(item, "no last pane");
  			return (CMD_RETURN_ERROR);