diff --git a/ChangeLog b/ChangeLog
index bf3082598..e9212541b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (redraw_icon): handle missing frame, prevents segv
+	with undecorated windows. #83298
+
 2002-05-28  Havoc Pennington  <hp@pobox.com>
 
         Patch from Erwann Chenede for raise_or_lower keybinding
diff --git a/src/window.c b/src/window.c
index 305f18d36..d2857b9d0 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4624,7 +4624,8 @@ static void
 redraw_icon (MetaWindow *window)
 {
   /* We could probably be smart and just redraw the icon here. */
-  meta_ui_queue_frame_draw (window->screen->ui, window->frame->xwindow);
+  if (window->frame)
+    meta_ui_queue_frame_draw (window->screen->ui, window->frame->xwindow);
 }
 
 static GList*