===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- src/usr.bin/tmux/server-fn.c	2020/05/16 15:34:08	1.125
+++ src/usr.bin/tmux/server-fn.c	2020/05/16 16:20:59	1.126
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.125 2020/05/16 15:34:08 nicm Exp $ */
+/* $OpenBSD: server-fn.c,v 1.126 2020/05/16 16:20:59 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -187,6 +187,7 @@
 		recalculate_sizes();
 	} else {
 		server_unzoom_window(w);
+		server_client_remove_pane(wp);
 		layout_close_pane(wp);
 		window_remove_pane(w, wp);
 		server_redraw_window(w);
@@ -348,6 +349,7 @@
 		notify_pane("pane-exited", wp);
 
 	server_unzoom_window(w);
+	server_client_remove_pane(wp);
 	layout_close_pane(wp);
 	window_remove_pane(w, wp);