diff --git a/server-client.c b/server-client.c
index 872515fc..ccd35c36 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1097,6 +1097,7 @@ have_event:
 			if (wp != NULL &&
 			    wp != w->active &&
 			    options_get_number(s->options, "focus-follows-mouse")) {
+				window_redraw_active_switch(w, wp);
 				window_set_active_pane(w, wp, 1);
 				server_redraw_window_borders(w);
 				server_status_window(w);