diff --git a/data/gnome-shell.schemas b/data/gnome-shell.schemas
index d6a7dbfe6..5798a3edb 100644
--- a/data/gnome-shell.schemas
+++ b/data/gnome-shell.schemas
@@ -43,5 +43,24 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/desktop/gnome/shell/windows/side_by_side_tiling</key>
+        <applyto>/desktop/gnome/shell/windows/side_by_side_tiling</applyto>
+        <owner>gnome-shell</owner>
+        <type>bool</type>
+        <default>true</default>
+        <locale name="C">
+          <short>enable side-by-side tiling when dropping windows on screen edges</short>
+          <long>
+             If enabled, dropping windows on screen edges maximizes them
+             vertically and resizes them horizontally to cover half of the
+             available area.
+
+             This key overrides /apps/metacity/general/side_by_side_tiling when
+             running GNOME Shell.
+          </long>
+        </locale>
+      </schema>
+
   </schemalist>
 </gconfschemafile>
diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index 3b78bd80f..227644f09 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -158,6 +158,8 @@ gnome_shell_plugin_init (GnomeShellPlugin *shell_plugin)
                                            "/desktop/gnome/shell/windows/attach_modal_dialogs");
   meta_prefs_override_preference_location ("/apps/metacity/general/button_layout",
                                            "/desktop/gnome/shell/windows/button_layout");
+  meta_prefs_override_preference_location ("/apps/metacity/general/side_by_side_tiling",
+                                           "/desktop/gnome/shell/windows/side_by_side_tiling");
 }
 
 static void