diff --git a/data/50-gnome-shell-typing.xml.in b/data/50-gnome-shell-typing.xml.in
deleted file mode 100644
index 7afd4c555..000000000
--- a/data/50-gnome-shell-typing.xml.in
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.shell.keybindings"
-                group="system"
-                _name="Typing"
-                wm_name="GNOME Shell"
-                package="gnome-shell">
-
-  <KeyListEntry name="switch-input-source"
-                _description="Switch to next source"/>
-
-  <KeyListEntry name="switch-input-source-backward"
-                _description="Switch to previous source"/>
-
-</KeyListEntries>
-
diff --git a/data/Makefile.am b/data/Makefile.am
index be6deef8c..f3e90b0ec 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -54,7 +54,6 @@ keysdir = @GNOME_KEYBINDINGS_KEYSDIR@
 keys_in_files =					\
 	50-gnome-shell-screenshot.xml.in	\
 	50-gnome-shell-system.xml.in		\
-	50-gnome-shell-typing.xml.in		\
 	$(NULL)
 keys_DATA = $(keys_in_files:.xml.in=.xml)
 
diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
index 313aea0b7..24af09336 100644
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -135,16 +135,6 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         Keybinding to start/stop the builtin screen recorder.
       </_description>
     </key>
-    <key name="switch-input-source" type="as">
-      <default>["&lt;Super&gt;space"]</default>
-      <_summary>Switch input source</_summary>
-      <_description>Binding to select the next input source</_description>
-    </key>
-    <key name="switch-input-source-backward" type="as">
-      <default>[]</default>
-      <_summary>Switch input source backward</_summary>
-      <_description>Binding to select the previous input source</_description>
-    </key>
   </schema>
 
   <schema id="org.gnome.shell.keyboard" path="/org/gnome/shell/keyboard/"
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 7959e6440..c1b4ea1e2 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -330,13 +330,13 @@ const InputSourceIndicator = new Lang.Class({
         this._mruSources = [];
         this._keybindingAction =
             Main.wm.addKeybinding('switch-input-source',
-                                  new Gio.Settings({ schema: "org.gnome.shell.keybindings" }),
+                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
                                   Meta.KeyBindingFlags.REVERSES,
                                   Main.KeybindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
         this._keybindingActionBackward =
             Main.wm.addKeybinding('switch-input-source-backward',
-                                  new Gio.Settings({ schema: "org.gnome.shell.keybindings" }),
+                                  new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
                                   Meta.KeyBindingFlags.REVERSES |
                                   Meta.KeyBindingFlags.REVERSED,
                                   Main.KeybindingMode.ALL,