diff --git a/src/window.c b/src/window.c
index 66a1d7d..7123780 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1954,7 +1954,8 @@
     }
 
     // If splitting horizontally, try to preserve height.
-    if (size == 0 && !(flags & WSP_VERT))
+    // Note that win_split_ins autocommands may have immediately closed "wp"!
+    if (size == 0 && !(flags & WSP_VERT) && win_valid(wp))
     {
 	win_setheight_win(height, wp);
 	if (p_ea)