diff --git a/darwin/common.nix b/darwin/common.nix
index fc66a97..b78ae45 100644
--- a/darwin/common.nix
+++ b/darwin/common.nix
@@ -114,6 +114,9 @@ in
       static-only = true;
       tilesize = lib.mkDefault 80;
 
+      # Do not automatically rearrange spaces based on most recent use
+      mru-spaces = false;
+
       # Hot corners
       wvous-bl-corner = hot-corners.QuickNote;
       wvous-br-corner = hot-corners.Launchpad;
@@ -132,7 +135,7 @@ in
     NSGlobalDomain = {
       AppleShowScrollBars = "Automatic";
       AppleScrollerPagingBehavior = true;
-      AppleSpacesSwitchOnActivate = lib.mkDefault true;
+      AppleSpacesSwitchOnActivate = lib.mkDefault false;
       "com.apple.swipescrolldirection" = false;
       NSAutomaticCapitalizationEnabled = false; # disable auto capitalization
       NSAutomaticDashSubstitutionEnabled = false; # disable auto dash substitution