1 files changed, 10 insertions, 8 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 7582c837c8..300514f424 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -3970,18 +3970,20 @@ win_remove (
     tabpage_T *tp                /* tab page "win" is in, NULL for current */
 )
 {
-  if (wp->w_prev != NULL)
+  if (wp->w_prev != NULL) {
     wp->w_prev->w_next = wp->w_next;
-  else if (tp == NULL)
-    firstwin = wp->w_next;
-  else
+  } else if (tp == NULL) {
+    firstwin = curtab->tp_firstwin = wp->w_next;
+  } else {
     tp->tp_firstwin = wp->w_next;
-  if (wp->w_next != NULL)
+  }
+  if (wp->w_next != NULL) {
     wp->w_next->w_prev = wp->w_prev;
-  else if (tp == NULL)
-    lastwin = wp->w_prev;
-  else
+  } else if (tp == NULL) {
+    lastwin = curtab->tp_lastwin = wp->w_prev;
+  } else {
     tp->tp_lastwin = wp->w_prev;
+  }
 }
 
 /*