diff --git a/modules/workstation/gnome.nix b/modules/workstation/gnome.nix
index fdd2cf8..449750c 100644
--- a/modules/workstation/gnome.nix
+++ b/modules/workstation/gnome.nix
@@ -82,9 +82,14 @@
         "org/gnome/shell/app-switcher" = { current-workspace-only = false; };
 
         # "org/gnome/eog/ui" = { image-gallery = true; };
+        # "/org/gnome/settings-daemon/plugins/power" = {
+        #   sleep-inactive-battery-type = "suspend";
+        #   sleep-inactive-battery-timeout = lib.hm.gvariant.mkUint32 900;
+        #   sleep-inactive-ac-type = "nothing";
+        # };
 
         "org/gnome/mutter" = {
-          edge-tiling = true;
+          edge-tiling = lib.mkDefault true;
           workspaces-only-on-primary = true;
           dynamic-workspaces = true;
         };
diff --git a/modules/workstation/pop-shell.nix b/modules/workstation/pop-shell.nix
index b1511fc..ba4bd6d 100644
--- a/modules/workstation/pop-shell.nix
+++ b/modules/workstation/pop-shell.nix
@@ -27,10 +27,12 @@
         # Enable and configure pop-shell, see:
         # - https://github.com/pop-os/shell/blob/master_jammy/scripts/configure.sh
         # - https://github.com/trevex/dotfiles/blob/5b3b0e2b9624fbedd1a64d378e18aea6efef6db9/modules/nixos/desktop/gnome/default.nix#L60
+        "org/gnome/mutter".edge-tiling = false;
 
         "org/gnome/shell/extensions/pop-shell" = {
           active-hint = true;
           smart-gaps = true;
+          tile-by-default = true;
           gap-outer = lib.hm.gvariant.mkUint32 0;
           gap-inner = lib.hm.gvariant.mkUint32 0;
         };