diff --git a/default/bash/aliases b/default/bash/aliases
index 39f4378a..398771ee 100644
--- a/default/bash/aliases
+++ b/default/bash/aliases
@@ -12,12 +12,22 @@ alias eff='$EDITOR "$(ff)"'
 if command -v zoxide &> /dev/null; then
   alias cd="zd"
   zd() {
-    if [ $# -eq 0 ]; then
-      builtin cd ~ && return
-    elif [ -d "$1" ]; then
-      builtin cd "$1"
+    if (( $# == 0 )); then
+      builtin cd ~ || return
+    elif [[ -d $1 ]]; then
+      builtin cd "$1" || return
     else
-      z "$@" && printf "\U000F17A9 " && pwd || echo "Error: Directory not found"
+      if ! z "$@"; then
+        echo "Error: Directory not found"
+        return 1
+      fi
+
+      printf "\U000F17A9 "
+      pwd
+    fi
+
+    if [[ -n $TMUX ]]; then
+      tmux rename-window "$(basename "$PWD")"
     fi
   }
 fi