diff --git a/ChangeLog b/ChangeLog
index c665f8628..0f3720f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-17  Havoc Pennington  <hp@pobox.com>
+
+	* src/stack.c (meta_stack_get_default_focus_window): don't use a
+	minimized window as the next focus window, patch from 
+	blackc@speakeasy.net	
+
 2002-06-17  Havoc Pennington  <hp@pobox.com>
 
 	* src/place.c (find_next_cascade): increase the cascade threshold
diff --git a/src/stack.c b/src/stack.c
index ee7e74999..27e7756b7 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -1011,6 +1011,7 @@ meta_stack_get_default_focus_window (MetaStack     *stack,
           if (window &&
               window != not_this_one &&
               (window->unmaps_pending == 0) &&
+              !window->minimized &&
               (workspace == NULL ||
                meta_window_visible_on_workspace (window, workspace)))
             {
diff --git a/src/window.c b/src/window.c
index 416f52f80..e4eebe6bf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -948,6 +948,7 @@ set_net_wm_state (MetaWindow *window)
   return meta_error_trap_pop (window->display);
 }
 
+/* FIXME rename this, it makes it sound like map state is relevant */
 gboolean
 meta_window_visible_on_workspace (MetaWindow    *window,
                                   MetaWorkspace *workspace)