diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
index 18eac2c4d..824d1b7e2 100644
--- a/data/org.gnome.shell.gschema.xml.in.in
+++ b/data/org.gnome.shell.gschema.xml.in.in
@@ -190,5 +190,13 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         This key overrides the key in org.gnome.mutter when running GNOME Shell.
       </description>
     </key>
+
+    <key name="focus-change-on-pointer-rest" type="b">
+      <default>true</default>
+      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
   </schema>
 </schemalist>
diff --git a/src/main.c b/src/main.c
index 451025d76..001a91a57 100644
--- a/src/main.c
+++ b/src/main.c
@@ -178,6 +178,8 @@ shell_prefs_init (void)
                                          OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("edge-tiling",
                                          OVERRIDES_SCHEMA);
+  meta_prefs_override_preference_schema ("focus-change-on-pointer-rest",
+                                         OVERRIDES_SCHEMA);
 }
 
 static void