1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index a762673fbf..9fd4de4bb2 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -457,12 +457,10 @@ Object nvim_win_call(Window window, LuaRef fun, Error *err)
 
   try_start();
   Object res = OBJECT_INIT;
-  switchwin_T switchwin;
-  if (switch_win_noblock(&switchwin, win, tabpage, true) == OK) {
+  WIN_EXECUTE(win, tabpage, {
     Array args = ARRAY_DICT_INIT;
     res = nlua_call_ref(fun, NULL, args, true, err);
-  }
-  restore_win_noblock(&switchwin, true);
+  });
   try_end(err);
   return res;
 }