diff --git a/js/ui/main.js b/js/ui/main.js
index bcd840e52..2657678b7 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -159,8 +159,6 @@ function _initializeUI() {
 
     _a11ySettings = new Gio.Settings({ schema: A11Y_SCHEMA });
 
-    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
-                                            false, -1, 1);
     global.display.connect('overlay-key', Lang.bind(overview, function () {
         if (!_a11ySettings.get_boolean (STICKY_KEYS_ENABLE))
             overview.toggle();
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index d6433a5cf..5f96a5fcc 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -474,6 +474,9 @@ const WindowManager = new Lang.Class({
         }));
 
         this._workspaceTracker = new WorkspaceTracker(this);
+
+        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
+                                                false, -1, 1);
     },
 
     setCustomKeybindingHandler: function(name, modes, handler) {