===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-copy.c,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- src/usr.bin/tmux/window-copy.c	2020/06/11 19:43:34	1.299
+++ src/usr.bin/tmux/window-copy.c	2020/06/16 07:28:57	1.300
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.299 2020/06/11 19:43:34 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.300 2020/06/16 07:28:57 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -4535,14 +4535,14 @@
 				    separators))
 					break;
 			} else {
-				if (data->cy == 0 &&
+				if (py == 0 ||
+				    (data->cy == 0 &&
 				    (screen_hsize(data->backing) == 0 ||
 				    data->oy >=
-				    screen_hsize(data->backing) - 1))
+				    screen_hsize(data->backing) - 1)))
 					goto out;
 
-				py = screen_hsize(data->backing) + data->cy -
-				    data->oy;
+				py--;
 				px = window_copy_find_length(wme, py);
 
 				/* Stop if separator at EOL. */