diff --git a/server-fn.c b/server-fn.c
index 83ea9474..a065dd76 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -351,6 +351,7 @@ server_unlink_window(struct session *s, struct winlink *wl)
 		server_destroy_session_group(s);
 	else
 		server_redraw_session_group(s);
+	session_renumber_windows(s);
 }
 
 void