1 files changed, 13 insertions, 6 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index a825a77f5f..b2812189d9 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -6866,16 +6866,23 @@ static void check_lnums_both(bool do_curwin, bool nested)
         wp->w_save_cursor.w_topline_save = wp->w_topline;
       }
 
-      if (wp->w_cursor.lnum > curbuf->b_ml.ml_line_count) {
+      bool need_adjust = wp->w_cursor.lnum > curbuf->b_ml.ml_line_count;
+      if (need_adjust) {
         wp->w_cursor.lnum = curbuf->b_ml.ml_line_count;
       }
-      if (wp->w_topline > curbuf->b_ml.ml_line_count) {
-        wp->w_topline = curbuf->b_ml.ml_line_count;
+      if (need_adjust || !nested) {
+        // save the (corrected) cursor position
+        wp->w_save_cursor.w_cursor_corr = wp->w_cursor;
       }
 
-      // save the (corrected) cursor position and topline
-      wp->w_save_cursor.w_cursor_corr = wp->w_cursor;
-      wp->w_save_cursor.w_topline_corr = wp->w_topline;
+      need_adjust = wp->w_topline > curbuf->b_ml.ml_line_count;
+      if (need_adjust) {
+        wp->w_topline = curbuf->b_ml.ml_line_count;
+      }
+      if (need_adjust || !nested) {
+        // save the (corrected) topline
+        wp->w_save_cursor.w_topline_corr = wp->w_topline;
+      }
     }
   }
 }