1 files changed, 10 insertions, 4 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 5e85a9bede..bbdf40b874 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -1741,6 +1741,11 @@ void close_windows(buf_T *buf, int keep_curwin)
     } else
       wp = wp->w_next;
   }
+  if (count != tabpage_index(NULL)) {
+    char_u prev_idx[NUMBUFLEN];
+    sprintf((char *)prev_idx, "%i", tabpage_index(curtab));
+    apply_autocmds(EVENT_TABCLOSED, prev_idx, prev_idx, false, curbuf);
+  }
 
   /* Also check windows in other tab pages. */
   for (tp = first_tabpage; tp != NULL; tp = nexttp) {
@@ -1757,15 +1762,16 @@ void close_windows(buf_T *buf, int keep_curwin)
           break;
         }
       }
+      if (count != tabpage_index(NULL)) {
+          char_u prev_idx[NUMBUFLEN];
+          sprintf((char *)prev_idx, "%i", tabpage_index(tp));
+          apply_autocmds(EVENT_TABCLOSED, prev_idx, prev_idx, false, curbuf);
+      }
     }
   }
 
   --RedrawingDisabled;
 
-  if (count != tabpage_index(NULL)) {
-    apply_autocmds(EVENT_TABCLOSED, NULL, NULL, false, curbuf);
-  }
-
   redraw_tabline = true;
   if (h != tabline_height()) {
     shell_new_rows();