diff --git a/ChangeLog b/ChangeLog
index 911cdb8af..cbc537fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-30  Colin Watson  <cjwatson@ubuntu.com>
+
+	* src/window-props.c (reload_transient_for): Clear
+	window->xtransient_for after emitting the invalid window warning.
+	#353540
+
 2006-09-07  Elijah Newren  <newren gmail com>
 
 	* src/metacity-dialog.c: Patch from Bruno Boaventura de Oliveira
diff --git a/src/window-props.c b/src/window-props.c
index 7c20de50b..daf4c03ca 100644
--- a/src/window-props.c
+++ b/src/window-props.c
@@ -1174,10 +1174,10 @@ reload_transient_for (MetaWindow    *window,
       meta_display_lookup_x_window (window->display, 
                                     window->xtransient_for) == NULL)
     {
-      window->xtransient_for = None;
       meta_warning (_("Invalid WM_TRANSIENT_FOR window 0x%lx specified "
                       "for %s.\n"),
                     window->xtransient_for, window->desc);
+      window->xtransient_for = None;
     }
 
   window->transient_parent_is_root_window =