diff --git a/aspects/desktop/niri.nix b/aspects/desktop/niri.nix
index 9c87723..bc99482 100644
--- a/aspects/desktop/niri.nix
+++ b/aspects/desktop/niri.nix
@@ -123,6 +123,7 @@
           }
 
           spawn-at-startup "noctalia-shell" "-d"
+          spawn-at-startup "${lib.getExe pkgs.niri-auto-centre}"
           layer-rule {
             match namespace="^noctalia-overview*"
             place-within-backdrop true
diff --git a/packages/hm-cli.nix b/packages/hm-cli.nix
index 94dae66..59f4b4f 100644
--- a/packages/hm-cli.nix
+++ b/packages/hm-cli.nix
@@ -5,8 +5,6 @@
     { pkgs, ... }:
     {
       packages.hm-cli = pkgs.writeShellScriptBin "hm" ''
-        set -e
-
         HM="${pkgs.lib.getExe pkgs.home-manager}"
         FLAKE_PATH="''${HM_PATH:-$HOME/.config/home-manager}"
         FLAKE_OUTPUT="''${HM_USER:-$(whoami)@$(hostname)}"
diff --git a/packages/niri-auto-centre.nix b/packages/niri-auto-centre.nix
new file mode 100644
index 0000000..dd7b04c
--- /dev/null
+++ b/packages/niri-auto-centre.nix
@@ -0,0 +1,32 @@
+{ ... }:
+
+{
+  perSystem =
+    { pkgs, ... }:
+    {
+      packages.niri-auto-centre = pkgs.writeShellApplication {
+        name = "niri-auto-centre";
+        runtimeInputs = [ pkgs.jq ];
+        text = ''
+          while true; do
+              ACTIVE_WORKSPACE=$(niri msg --json workspaces | jq -r '.[] | select(.is_active == true)')
+              WORKSPACE_ID=$(echo "$ACTIVE_WORKSPACE" | jq -r '.id')
+              OUTPUT_NAME=$(echo "$ACTIVE_WORKSPACE" | jq -r '.output')
+              
+              MONITOR_WIDTH=$(niri msg --json outputs | jq -r ".\"$OUTPUT_NAME\".logical.width")
+              
+              SUMMED_TILE_WIDTH=$(niri msg --json windows | jq --argjson wid "$WORKSPACE_ID" -r '
+                  [.[] | select(.workspace_id == $wid) | {col: .layout.pos_in_scrolling_layout[0], width: .layout.tile_size[0]}]
+                  | group_by(.col) | map(first.width) | add
+              ')
+              
+              if awk "BEGIN {exit !($SUMMED_TILE_WIDTH < $MONITOR_WIDTH)}"; then
+                  niri msg action center-visible-columns
+              fi
+              
+              sleep 0.1
+          done
+        '';
+      };
+    };
+}