1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index a68ae805e8..01cb9a6847 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -67,6 +67,10 @@ void nvim_win_set_buf(Window window, Buffer buffer, Error *err)
                   buffer);
   }
 
+  // If window is not current, state logic will not validate its cursor.
+  // So do it now.
+  validate_cursor();
+
   restore_win(save_curwin, save_curtab, false);
 }