diff --git a/ChangeLog b/ChangeLog
index 7a72c7d99..e85ef13c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-07  Havoc Pennington  <hp@pobox.com>
+
+	* src/window.c (meta_window_unminimize): when unminimizing an app,
+	if we're in "show desktop" (all windows minimized) mode, leave
+	show desktop mode. Will occasionally be a bit weird, but allows
+	people to recover via task list if they accidentally do the show
+	desktop thing, and don't know what's going on.
+
 2001-12-06  Havoc Pennington  <hp@redhat.com>
 
 	* src/ui.c (meta_text_property_to_utf8): fix gdkatom/xatom screwup
diff --git a/src/window.c b/src/window.c
index aa17a8c86..99c5e1635 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1133,6 +1133,9 @@ meta_window_minimize (MetaWindow  *window)
 void
 meta_window_unminimize (MetaWindow  *window)
 {
+  if (window->display->showing_desktop)
+    meta_display_unshow_desktop (window->display);
+  
   if (window->minimized)
     {
       window->minimized = FALSE;