diff --git a/ChangeLog b/ChangeLog
index 265f94bfb..b90f6335b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-04-16  Elijah Newren  <newren gmail com>
+
+	Prevent metacity from "forgetting" which machine a window is on.
+	#418552
+
+	* src/window.c (meta_window_new_with_attrs): reorder the property
+	loading so that we know the wm_client_machine when we load the
+	name of the window and can modify the window name accordingly.
+
 2007-04-16  Elijah Newren  <newren gmail com>
 
         * configure.in: post-release bump to 2.19.5.
diff --git a/src/window.c b/src/window.c
index 59267c808..e47902197 100644
--- a/src/window.c
+++ b/src/window.c
@@ -556,14 +556,15 @@ meta_window_new_with_attrs (MetaDisplay       *display,
   window->xgroup_leader = None;
   meta_window_compute_group (window);
   
-  /* Fill these in the order we want them to be gotten.
-   * we want to get window name and class first
-   * so we can use them in error messages and such.
+  /* Fill these in the order we want them to be gotten.  we want to
+   * get window name and class first so we can use them in error
+   * messages and such.  However, name is modified depending on
+   * wm_client_machine, so push it slightly sooner.
    */
   i = 0;
+  initial_props[i++] = display->atom_wm_client_machine;
   initial_props[i++] = display->atom_net_wm_name;
   initial_props[i++] = XA_WM_CLASS;
-  initial_props[i++] = display->atom_wm_client_machine;
   initial_props[i++] = display->atom_net_wm_pid;
   initial_props[i++] = XA_WM_NAME;
   initial_props[i++] = display->atom_net_wm_icon_name;