1 files changed, 2 insertions, 1 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index 977d31703fb..c695e466e78 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19157,7 +19157,8 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
           struct glyph_row *row;
 
           row = MATRIX_FIRST_TEXT_ROW (w->desired_matrix);
-          while (MATRIX_ROW_BOTTOM_Y (row) < new_vpos)
+          while (MATRIX_ROW_BOTTOM_Y (row) < new_vpos
+                 && !row->ends_at_zv_p)
             ++row;
 
           TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row),