1 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index f5d8edc751..f41a5d8872 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -3679,7 +3679,12 @@ win_free (
 
   if (wp != aucmd_win)
     win_remove(wp, tp);
-  free(wp);
+  if (autocmd_busy) {
+    wp->w_next = au_pending_free_win;
+    au_pending_free_win = wp;
+  } else {
+    free(wp);
+  }
 
   unblock_autocmds();
 }