4 files changed, 16 insertions, 1 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 8dda13cd..29df5a66 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2242,6 +2242,14 @@ handle_switch_to_workspace (MetaDisplay    *display,
 {
   gint which = binding->handler->data;
   MetaWorkspace *workspace;
+
+  if (which == META_MOTION_PREV)
+    {
+      workspace = screen->prev_workspace;
+      if (workspace)
+          meta_workspace_activate (workspace, event->xkey.time);
+      return;
+    }
   
   if (which < 0)
     {
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index 8eb02d00..0d1d4bc5 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -85,6 +85,9 @@ struct _MetaScreen
   
   MetaWorkspace *active_workspace;
 
+  /* Previous active workspace */
+  MetaWorkspace *prev_workspace;
+
   /* This window holds the focus when we don't want to focus
    * any actual clients
    */
diff --git a/src/core/workspace.c b/src/core/workspace.c
index 05ca7c70..a0a8ad1e 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -385,6 +385,9 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
   /* Note that old can be NULL; e.g. when starting up */
   old = workspace->screen->active_workspace;
   
+  /* Save old workspace, to be able to switch back. */
+  workspace->screen->prev_workspace = old;
+
   workspace->screen->active_workspace = workspace;
 
   set_active_space_hint (workspace->screen);
diff --git a/src/core/workspace.h b/src/core/workspace.h
index c6983bf0..e2c5a244 100644
--- a/src/core/workspace.h
+++ b/src/core/workspace.h
@@ -43,7 +43,8 @@ typedef enum
   META_MOTION_UP = -1,
   META_MOTION_DOWN = -2,
   META_MOTION_LEFT = -3,
-  META_MOTION_RIGHT = -4
+  META_MOTION_RIGHT = -4,
+  META_MOTION_PREV = -5
 } MetaMotionDirection;
 
 struct _MetaWorkspace