diff --git a/ChangeLog b/ChangeLog
index 3fd86c7ec..40bc01206 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-28  Owen Taylor  <otaylor@redhat.com>
+
+        * src/core/window.c (meta_window_new_with_attrs): Don't
+        immediately unminimize an initially iconic window (#491090)
+
 2008-03-27  Thomas Thurman  <tthurman@gnome.org>
 
         * src/core/session.c (regenerate_save_file, save_state, load_state):
diff --git a/src/core/window.c b/src/core/window.c
index 3e6eb58e6..d1c32daf1 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -799,8 +799,11 @@ meta_window_new_with_attrs (MetaDisplay       *display,
    * However, we shouldn't unminimize windows here when opening
    * a new display because that breaks passing _NET_WM_STATE_HIDDEN
    * between window managers when replacing them; see bug 358042.
+   *
+   * And we shouldn't unminimize windows if they were initially
+   * iconic.
    */
-  if (!display->display_opening)
+  if (!display->display_opening && !window->initially_iconic)
     unminimize_window_and_all_transient_parents (window);
 
   meta_error_trap_pop (display, FALSE); /* pop the XSync()-reducing trap */