1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 56202177c0..5ea6716c0a 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -1482,9 +1482,10 @@ static void ins_redraw(
     }
   }
 
-  if (ready && has_event(EVENT_SCROLL)
-      && curwin->w_viewport_invalid) {
-    apply_autocmds(EVENT_SCROLL, NULL, NULL, false, curbuf);
+  // Trigger Scroll if viewport changed.
+  if (ready && has_event(EVENT_WINSCROLLED)
+      && win_did_scroll(curwin)) {
+    do_autocmd_winscrolled(curwin);
   }
 
   if (curwin->w_p_cole > 0 && conceal_cursor_line(curwin)