diff --git a/ChangeLog b/ChangeLog
index de14e97af..99a2c822f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-28  Rached Ben Mustapha <rached@benmur.net>
+
+        Fix bug #118428
+	
+        * src/window.c (redraw_icon): Also redraw window icon if the window
+	is not mapped but its frame is.
+	(idle_update_icon): Unset the window->update_icon_queued flag.	
+	
 2003-09-29  Havoc Pennington  <hp@redhat.com>
 
 	* src/tabpopup.c (meta_ui_tab_popup_new): put a random cap on
diff --git a/src/window.c b/src/window.c
index bb7894ca9..ec0642493 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4707,7 +4707,7 @@ redraw_icon (MetaWindow *window)
   /* We could probably be smart and just redraw the icon here,
    * instead of the whole frame.
    */
-  if (window->frame && window->mapped)
+  if (window->frame && (window->mapped || window->frame->mapped))
     meta_ui_queue_frame_draw (window->screen->ui, window->frame->xwindow);
 }
 
@@ -4776,8 +4776,8 @@ idle_update_icon (gpointer data)
 
       window = tmp->data;
 
-      /* As a side effect, sets window->update_icon_queued = FALSE */
       meta_window_update_icon_now (window); 
+      window->update_icon_queued = FALSE;
       
       tmp = tmp->next;
     }