diff --git a/js/ui/main.js b/js/ui/main.js
index d9ffda79e..477b77e03 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -109,6 +109,8 @@ function start() {
     Gio.DesktopAppInfo.set_desktop_env('GNOME');
 
     sessionMode = new SessionMode.SessionMode();
+    Meta.prefs_override_preference_schema(sessionMode.buttonLayout[0], sessionMode.buttonLayout[1]);
+
     shellDBusService = new ShellDBus.GnomeShell();
     shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
 
diff --git a/src/main.c b/src/main.c
index a07b5c4e9..179eef58d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -174,8 +174,6 @@ shell_prefs_init (void)
                                          OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("workspaces-only-on-primary",
                                          OVERRIDES_SCHEMA);
-  meta_prefs_override_preference_schema ("button-layout",
-                                         OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("edge-tiling",
                                          OVERRIDES_SCHEMA);
   meta_prefs_override_preference_schema ("focus-change-on-pointer-rest",