Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.220
diff -p -u -r1.220 display.c
--- src/display.c	7 Aug 2004 03:13:56 -0000	1.220
+++ src/display.c	7 Aug 2004 20:41:46 -0000
@@ -2057,8 +2057,13 @@ event_callback (XEvent   *event,
 
                   if (workspace)
                     {
-                      meta_workspace_activate (workspace);
-                      meta_workspace_focus_default_window (workspace, NULL);
+                      if (workspace != screen->active_workspace)
+                        {
+                          meta_workspace_activate (workspace);
+                          meta_workspace_focus_default_window (workspace, NULL);
+                        }
+                      else
+                        meta_verbose ("Workspace %d already active.\n", space);
                     }
                   else
                     meta_verbose ("Don't know about workspace %d\n", space);
