diff --git a/dot_config/zsh/files/aliases.zsh b/dot_config/zsh/files/aliases.zsh
index 62eb2bd..58307fe 100644
--- a/dot_config/zsh/files/aliases.zsh
+++ b/dot_config/zsh/files/aliases.zsh
@@ -41,6 +41,20 @@ function runranger() {
 zle -N runranger
 bindkey '^f' runranger
 
+function yy() {
+	if [ -n "$YAZI_LEVEL" ]; then
+		exit
+	fi
+
+	local tmp="$(mktemp -t "yazi-cwd.XXXXX")"
+	yazi "$@" --cwd-file="$tmp"
+	if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
+		cd -- "$cwd"
+	fi
+	rm -f -- "$tmp"
+}
+bindkey -s "^y" "yy\n"
+
 function ss() {
     command grc --colour=auto ss "$@"
 }