diff --git a/src/moveresize.c b/src/moveresize.c
index 30ec98e6..7f6e503c 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -899,6 +899,7 @@ clientMoveEventFilter (XfwmEvent *event, gpointer data)
     if (event->meta.type == XFWM_EVENT_KEY && event->key.pressed)
     {
         int key_move;
+        int action_key;
 
         while (xfwm_device_check_mask_event (display_info->devices, display_info->dpy,
                                              KeyPressMask, event))
@@ -907,6 +908,12 @@ clientMoveEventFilter (XfwmEvent *event, gpointer data)
             myDisplayUpdateCurrentTime (display_info, event);
         }
 
+        action_key = myScreenGetKeyPressed (screen_info, &event->key);
+        if (action_key >= KEY_WORKSPACE_1 && action_key <= KEY_WORKSPACE_12)
+        {
+            workspaceSwitch (screen_info, action_key - KEY_WORKSPACE_1, c, FALSE, event->key.time);
+        }
+
         key_move = 16;
         if ((screen_info->params->snap_to_border) || (screen_info->params->snap_to_windows))
         {