diff --git a/cmd-select-window.c b/cmd-select-window.c
index c85f36be..8dd358b0 100644
--- a/cmd-select-window.c
+++ b/cmd-select-window.c
@@ -142,7 +142,7 @@ cmd_select_window_exec(struct cmd *self, struct cmdq_item *item)
 		}
 		cmdq_insert_hook(s, item, current, "after-select-window");
 	}
-	if (c->session != NULL)
+	if (c != NULL && c->session != NULL)
 		s->curw->window->latest = c;
 	recalculate_sizes();