diff --git a/ChangeLog b/ChangeLog
index 2481d36b8..d9ee435ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-24  Elijah Newren  <newren@math.utah.edu>
+
+	* src/keybindings.c: (handle_toggle_desktop): Choose correct
+	window to focus when "un-showing" the desktop.  Fixes #144900.
+
 2004-06-24  Elijah Newren  <newren@math.utah.edu>
 
 	Make choice of focus window be consistent for each focus mode.
diff --git a/src/keybindings.c b/src/keybindings.c
index 0c9db78be..89c6d57f6 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -2756,7 +2756,7 @@ handle_toggle_desktop (MetaDisplay    *display,
   if (screen->showing_desktop)
     {
       meta_screen_unshow_desktop (screen);
-      meta_workspace_focus_top_window (screen->active_workspace, NULL);
+      meta_workspace_focus_default_window (screen->active_workspace, NULL);
     }
   else
     meta_screen_show_desktop (screen);