diff --git a/tmux.h b/tmux.h
index 6ab9861b..0a17f72b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1005,6 +1005,7 @@ struct window {
 #define WINDOW_REDRAW 0x4
 #define WINDOW_SILENCE 0x8
 #define WINDOW_ZOOMED 0x10
+#define WINDOW_ALERTFLAGS (WINDOW_BELL|WINDOW_ACTIVITY|WINDOW_SILENCE)
 
 	struct options	 options;
 
diff --git a/window.c b/window.c
index 7678adc6..7912bd37 100644
--- a/window.c
+++ b/window.c
@@ -1243,6 +1243,7 @@ winlink_clear_flags(struct winlink *wl)
 				continue;
 
 			wm->flags &= ~WINLINK_ALERTFLAGS;
+			wm->window->flags &= ~WINDOW_ALERTFLAGS;
 			server_status_session(s);
 		}
 	}