diff --git a/server-client.c b/server-client.c
index 7ef91236..8b2ea00f 100644
--- a/server-client.c
+++ b/server-client.c
@@ -331,7 +331,8 @@ server_client_handle_key(int key, struct mouse_event *mouse, void *data)
 		if (mouse->y + 1 == c->tty.sy &&
 		    options_get_number(oo, "mouse-select-window") &&
 		    options_get_number(oo, "status")) {
-			if (mouse->b == MOUSE_UP) {
+			if (mouse->b == MOUSE_UP &&
+			    c->last_mouse.b != MOUSE_UP) {
 				status_set_window_at(c, mouse->x);
 				return;
 			}