diff --git a/data/gnome-shell.schemas b/data/gnome-shell.schemas
index 24cade651..f2e69eefd 100644
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@@ -81,5 +81,20 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/desktop/gnome/shell/windows/workspaces_only_on_primary</key>
+        <applyto>/desktop/gnome/shell/windows/workspaces_only_on_primary</applyto>
+        <owner>gnome-shell</owner>
+        <type>bool</type>
+        <default>true</default>
+        <locale name="C">
+          <short>Workspaces only on primary monitor</short>
+          <long>
+             This key overrides /apps/mutter/general/workspaces_only_on_primary when
+             running GNOME Shell.
+          </long>
+        </locale>
+      </schema>
+
   </schemalist>
 </gconfschemafile>
diff --git a/src/main.c b/src/main.c
index ba53a73ac..029acb80f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -221,6 +221,8 @@ shell_prefs_init (void)
 {
   meta_prefs_override_preference_location ("/apps/mutter/general/attach_modal_dialogs",
                                            "/desktop/gnome/shell/windows/attach_modal_dialogs");
+  meta_prefs_override_preference_location ("/apps/mutter/general/workspaces_only_on_primary",
+                                           "/desktop/gnome/shell/windows/workspaces_only_on_primary");
   meta_prefs_override_preference_location ("/apps/metacity/general/button_layout",
                                            "/desktop/gnome/shell/windows/button_layout");
   meta_prefs_override_preference_location ("/apps/metacity/general/edge_tiling",