diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index ea6576fb..05ec10e9 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -77,6 +77,8 @@ set -g status-interval 5
 set -g status-left-length 30
 set -g status-right-length 50
 set -g window-status-separator ""
+set -gw automatic-rename on
+set -gw automatic-rename-format '#{b:pane_current_path}'
 
 # Theme
 set -g status-style "bg=default,fg=default"
diff --git a/default/bash/aliases b/default/bash/aliases
index 398771ee..667912a8 100644
--- a/default/bash/aliases
+++ b/default/bash/aliases
@@ -25,10 +25,6 @@ if command -v zoxide &> /dev/null; then
       printf "\U000F17A9 "
       pwd
     fi
-
-    if [[ -n $TMUX ]]; then
-      tmux rename-window "$(basename "$PWD")"
-    fi
   }
 fi