diff --git a/server-client.c b/server-client.c
index 24fa147e..ae41278a 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1239,6 +1239,8 @@ server_client_loop(void)
 	struct client		*c;
 	struct window		*w;
 	struct window_pane	*wp;
+	struct winlink		*wl;
+	struct session		*s;
 	int			 focus;
 
 	TAILQ_FOREACH(c, &clients, entry) {
@@ -1255,8 +1257,13 @@ server_client_loop(void)
 	 */
 	focus = options_get_number(global_options, "focus-events");
 	RB_FOREACH(w, windows, &windows) {
+		TAILQ_FOREACH(wl, &w->winlinks, wentry) {
+			s = wl->session;
+			if (s->attached != 0 && s->curw == wl)
+				break;
+		}
 		TAILQ_FOREACH(wp, &w->panes, entry) {
-			if (wp->fd != -1) {
+			if (wl != NULL && wp->fd != -1) {
 				if (focus)
 					server_client_check_focus(wp);
 				server_client_check_resize(wp);