diff --git a/ChangeLog b/ChangeLog
index 38679350f..1774a12b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-25  Elijah Newren  <newren@gmail.com>
+
+	* src/window.c: (meta_window_new_with_attrs): set the window state
+	hints _after_ applying session information.  Fixes #164677.
+
 2005-01-25  Elijah Newren  <newren@gmail.com>
 
 	Add man pages for metacity-window-demo and metacity-theme-viewer.
diff --git a/src/window.c b/src/window.c
index defc0830e..551149cee 100644
--- a/src/window.c
+++ b/src/window.c
@@ -588,12 +588,6 @@ meta_window_new_with_attrs (MetaDisplay       *display,
    */
   meta_screen_apply_startup_properties (window->screen, window);
   
-  /* FIXME we have a tendency to set this then immediately
-   * change it again.
-   */
-  set_wm_state (window, window->iconic ? IconicState : NormalState);
-  set_net_wm_state (window);
-
   if (window->decorated)
     meta_window_ensure_frame (window);
 
@@ -714,6 +708,12 @@ meta_window_new_with_attrs (MetaDisplay       *display,
       }
   }
   
+  /* FIXME we have a tendency to set this then immediately
+   * change it again.
+   */
+  set_wm_state (window, window->iconic ? IconicState : NormalState);
+  set_net_wm_state (window);
+
   /* Sync stack changes */
   meta_stack_thaw (window->screen->stack);