diff --git a/window.c b/window.c
index 43c272bc..d53c606e 100644
--- a/window.c
+++ b/window.c
@@ -474,7 +474,7 @@ window_pane_update_focus(struct window_pane *wp)
 	struct client	*c;
 	int		 focused = 0;
 
-	if (wp != NULL) {
+	if (wp != NULL && (~wp->flags & PANE_EXITED)) {
 		if (wp != wp->window->active)
 			focused = 0;
 		else {