Index: libwnck/tasklist.c
===================================================================
--- libwnck/tasklist.c	(revision 1635)
+++ libwnck/tasklist.c	(working copy)
@@ -2785,6 +2785,8 @@
           active_ws != window_ws &&
           !tasklist->priv->switch_workspace_on_unminimize)
         wnck_workspace_activate (window_ws, timestamp);
+      else
+	wnck_window_move_to_workspace (task->window, active_ws);
 
       wnck_window_activate_transient (task->window, timestamp);
     }
