diff --git a/Changelog b/Changelog
index 8ab6cad..2fe8b90 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 [Changes 1.2c01]
 
+* Fix STATUS_NOTIFY so that it appears in the right window. (caf)
+
 * Improve handling of padding in status formats. (caf)
 
 * Use system setenv() in preference to compat bsd_setenv(). (caf)
diff --git a/source/status.c b/source/status.c
index 03390dc..f92eefa 100644
--- a/source/status.c
+++ b/source/status.c
@@ -988,14 +988,14 @@ static	char	*status_notify_windows(Window *window)
 	if (get_int_var(SHOW_STATUS_ALL_VAR) || window == window->screen->current_window)
 	{
 		*notes = 0;
-		window = NULL;
-		while ((traverse_all_windows(&window)))
+		Window *notify_win = NULL;
+		while ((traverse_all_windows(&notify_win)))
 		{
-			if (window->miscflags & WINDOW_NOTIFIED)
+			if (notify_win->miscflags & WINDOW_NOTIFIED)
 			{
 				if (doneone++)
 					strlcat(notes, ",", sizeof notes);
-				strlcat(notes, ltoa(window->refnum), sizeof notes);
+				strlcat(notes, ltoa(notify_win->refnum), sizeof notes);
 			}
 		}
 	}