diff --git a/.config/fish/functions/y.fish b/.config/fish/functions/y.fish
new file mode 100644
index 00000000..6b263044
--- /dev/null
+++ b/.config/fish/functions/y.fish
@@ -0,0 +1,8 @@
+function y
+    set tmp (mktemp -t "yazi-cwd.XXXXXX")
+    yazi $argv --cwd-file="$tmp"
+    if set cwd (command cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+        builtin cd -- "$cwd"
+    end
+    rm -f -- "$tmp"
+end
diff --git a/.config/yadm/tracked b/.config/yadm/tracked
index 06a19cc8..a1e08f8e 100644
--- a/.config/yadm/tracked
+++ b/.config/yadm/tracked
@@ -61,3 +61,4 @@
 .config/chawan
 .config/waybar
 .config/fastfetch
+.config/fish