diff --git a/common/.bashrc b/common/.bashrc
index 7c318f6..0b73cec 100644
--- a/common/.bashrc
+++ b/common/.bashrc
@@ -206,6 +206,15 @@ ssh() {
 	)
 }
 
+# Yazi 
+function y() {
+	local tmp cwd; tmp="$(mktemp -t "yazi-cwd.XXXXXX")"
+	command yazi "$@" --cwd-file="$tmp"
+	IFS= read -r -d '' cwd < "$tmp"
+	[ "$cwd" != "$PWD" ] && [ -d "$cwd" ] && builtin cd -- "$cwd" || builtin true
+	command rm -f -- "$tmp"
+}
+
 # Git prompt
 if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
     GIT_PROMPT_ONLY_IN_REPO=1