===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/spawn.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- src/usr.bin/tmux/spawn.c	2020/04/23 05:48:42	1.22
+++ src/usr.bin/tmux/spawn.c	2020/05/16 16:20:59	1.23
@@ -1,4 +1,4 @@
-/* $OpenBSD: spawn.c,v 1.22 2020/04/23 05:48:42 nicm Exp $ */
+/* $OpenBSD: spawn.c,v 1.23 2020/05/16 16:20:59 nicm Exp $ */
 
 /*
  * Copyright (c) 2019 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -362,6 +362,7 @@
 		xasprintf(cause, "fork failed: %s", strerror(errno));
 		new_wp->fd = -1;
 		if (~sc->flags & SPAWN_RESPAWN) {
+			server_client_remove_pane(new_wp);
 			layout_close_pane(new_wp);
 			window_remove_pane(w, new_wp);
 		}