diff --git a/cmd-select-pane.c b/cmd-select-pane.c
index d24d7b3d..b8a12671 100644
--- a/cmd-select-pane.c
+++ b/cmd-select-pane.c
@@ -80,6 +80,7 @@ cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 			return (CMD_RETURN_ERROR);
 		}
 
+		server_unzoom_window(wl->window);
 		window_set_active_pane(wl->window, wl->window->last);
 		server_status_window(wl->window);
 		server_redraw_window_borders(wl->window);
diff --git a/tmux.1 b/tmux.1
index a65ce221..1a9c0583 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1619,7 +1619,7 @@ is given in lines or cells (the default is 1).
 .Pp
 With
 .Fl Z ,
-the active pane is toggled between occupying the whole of the window and it's
+the active pane is toggled between occupying the whole of the window and its
 normal position in the layout.
 .It Xo Ic respawn-pane
 .Op Fl k