diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 33e8ece..fe26daa 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -114,6 +114,9 @@ in
     terminal = "screen-256color";
     extraConfig = ''
       bind-key j command-prompt -p "Join pane:"  "join-pane -s '%%'"
+      set -g base-index 1
+      set -g pane-base-index 1
+      set -g renumber-windows on
     '';
   };