diff --git a/src/fe-common/core/fe-windows.c b/src/fe-common/core/fe-windows.c
index 38dd22fe..f24ddb7b 100644
--- a/src/fe-common/core/fe-windows.c
+++ b/src/fe-common/core/fe-windows.c
@@ -160,6 +160,9 @@ void window_set_active(WINDOW_REC *window)
 
 void window_change_server(WINDOW_REC *window, void *server)
 {
+	if (server != NULL && SERVER(server)->disconnected)
+		return;
+
 	window->active_server = server;
 	signal_emit("window server changed", 2, window, server);
 }