diff --git a/src/move.c b/src/move.c
index cd90379..69091fd 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1247,7 +1247,7 @@
 	    // character is left or right of the window
 	    row = scol = ccol = ecol = 0;
     }
-    *rowp = wp->w_winrow + row + rowoff;
+    *rowp = W_WINROW(wp) + row + rowoff;
     *scolp = scol + coloff;
     *ccolp = ccol + coloff;
     *ecolp = ecol + coloff;