diff --git a/screen-write.c b/screen-write.c
index 0fcd156f..01632f61 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -2013,7 +2013,7 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct grid_cell *gc)
 
 	/*
 	 * Check if we need to combine characters. This could be zero width
-	 * (zet above), a modifier character (with an existing Unicode
+	 * (set above), a modifier character (with an existing Unicode
 	 * character) or a previous ZWJ.
 	 */
 	if (!zero_width) {
diff --git a/window.c b/window.c
index c1365993..c16dc128 100644
--- a/window.c
+++ b/window.c
@@ -340,6 +340,7 @@ window_destroy(struct window *w)
 {
 	log_debug("window @%u destroyed (%d references)", w->id, w->references);
 
+	window_unzoom(w);
 	RB_REMOVE(windows, &windows, w);
 
 	if (w->layout_root != NULL)