diff --git a/src/terminal.c b/src/terminal.c
index 1764b05..21026e2 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3019,6 +3019,8 @@
 	    ch_log(NULL, "terminal job finished, closing window");
 	    aucmd_prepbuf(&aco, term->tl_buffer);
 	    // Avoid closing the window if we temporarily use it.
+	    if (curwin == aucmd_win)
+		do_set_w_closing = TRUE;
 	    if (do_set_w_closing)
 		curwin->w_closing = TRUE;
 	    do_bufdel(DOBUF_WIPE, (char_u *)"", 1, fnum, fnum, FALSE);
diff --git a/src/version.c b/src/version.c
index ee07b96..86ccdf4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1566,
+/**/
     1565,
 /**/
     1564,