diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index f236c1ef3..c260439b8 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -4958,6 +4958,20 @@ init_builtin_key_bindings (MetaDisplay *display)
                           META_KEYBINDING_ACTION_DECREASE_OPACITY,
                           handle_opacity, 0);
 
+  add_builtin_keybinding (display,
+                          "toggle-workspace-selection",
+                          common_keybindings,
+                          META_KEY_BINDING_NONE,
+                          META_KEYBINDING_ACTION_TOGGLE_WORKSPACE_SELECTION,
+                          NULL, 0);
+
+  add_builtin_keybinding (display,
+                          "toggle-window-selection",
+                          common_keybindings,
+                          META_KEY_BINDING_NONE,
+                          META_KEYBINDING_ACTION_TOGGLE_WINDOW_SELECTION,
+                          NULL, 0);
+
   g_object_unref (common_keybindings);
   g_object_unref (mutter_keybindings);
   g_object_unref (mutter_wayland_keybindings);
diff --git a/src/meta/prefs.h b/src/meta/prefs.h
index ef319b714..dae302629 100644
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -380,6 +380,8 @@ gboolean    meta_prefs_get_invert_flip_direction (void);
  * @META_KEYBINDING_ACTION_LOCATE_POINTER_KEY: FILLME
  * @META_KEYBINDING_ACTION_ALWAYS_ON_TOP: FILLME
  * @META_KEYBINDING_ACTION_LAST: FILLME
+ * @META_KEYBINDING_ACTION_TOGGLE_WORKSPACE_SELECTION: FILLME
+ * @META_KEYBINDING_ACTION_TOGGLE_WINDOW_SELECTION: FILLME
  */
 /* XXX FIXME This should be x-macroed, but isn't yet because it would be
  * difficult (or perhaps impossible) to add the suffixes using the current
@@ -484,6 +486,8 @@ typedef enum _MetaKeyBindingAction
   META_KEYBINDING_ACTION_ALWAYS_ON_TOP,
   META_KEYBINDING_ACTION_SWITCH_MONITOR,
   META_KEYBINDING_ACTION_ROTATE_MONITOR,
+  META_KEYBINDING_ACTION_TOGGLE_WORKSPACE_SELECTION,
+  META_KEYBINDING_ACTION_TOGGLE_WINDOW_SELECTION,
 
   META_KEYBINDING_ACTION_LAST
 } MetaKeyBindingAction;