diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
index 3772d46e8..acf6adeb5 100644
--- a/data/org.gnome.shell.gschema.xml.in
+++ b/data/org.gnome.shell.gschema.xml.in
@@ -172,6 +172,14 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
       </description>
     </key>
 
+    <key name="dynamic-workspaces" type="b">
+      <default>true</default>
+      <summary>Workspaces are managed dynamically</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+
     <key name="workspaces-only-on-primary" type="b">
       <default>true</default>
       <summary>Workspaces only on primary monitor</summary>
diff --git a/src/main.c b/src/main.c
index c872a12df..bac9524a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -163,6 +163,8 @@ shell_prefs_init (void)
 {
   meta_prefs_override_preference_schema ("attach-modal-dialogs",
                                          OVERRIDES_SCHEMA);
+  meta_prefs_override_preference_schema ("dynamic-workspaces",
+                                         OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("workspaces-only-on-primary",
                                          OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("button-layout",