diff --git a/server-client.c b/server-client.c
index dd4b6e08..481d5a71 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1819,12 +1819,13 @@ server_client_reset_state(struct client *c)
 			cx = wp->xoff + (int)s->cx - (int)ox;
 			cy = wp->yoff + (int)s->cy - (int)oy;
 
+			r = screen_redraw_get_visible_ranges(wp, cx, cy, 1, NULL);
+			if (!screen_redraw_is_visible(r, cx))
+				cursor = 0;
+
 			if (status_at_line(c) == 0)
 				cy += status_line_size(c);
 		}
-		r = screen_redraw_get_visible_ranges(wp, cx, cy, 1, NULL);
-		if (!screen_redraw_is_visible(r, cx))
-			cursor = 0;
 
 		if (!cursor)
 			mode &= ~MODE_CURSOR;