diff --git a/wrappers/fish/config.fish b/wrappers/fish/config.fish
index d015449..6f218d6 100644
--- a/wrappers/fish/config.fish
+++ b/wrappers/fish/config.fish
@@ -25,4 +25,12 @@ and begin
     # Integrations
     zoxide init fish | source
     direnv hook fish | source
+    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" ]
+            __zoxide_cd_internal -- "$cwd"
+        end
+        rm -f -- "$tmp"
+    end
 end
diff --git a/wrappers/fish/default.nix b/wrappers/fish/default.nix
index 253aa8a..409cfbd 100644
--- a/wrappers/fish/default.nix
+++ b/wrappers/fish/default.nix
@@ -37,6 +37,7 @@
           direnv
           fd
           file
+          yazi
         ];
       };
   };