diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ef7ffe..1fe89cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - POSIX: support for non-Cygwin Windows environments (e.g. Busybox).
 - Support for RISC-V (riscv64) Linux.
 - `import` now supports fetching entries from `atuin`.
+- Fish: record the selected directory in shell history when using interactive
+  Space-Tab completions.
 
 ### Changed
 
diff --git a/templates/fish.txt b/templates/fish.txt
index f5d4aa4..4e163a0 100644
--- a/templates/fish.txt
+++ b/templates/fish.txt
@@ -103,6 +103,7 @@ function __zoxide_z_complete
         set -l result (command zoxide query --exclude (__zoxide_pwd) --interactive -- $query)
         and __zoxide_cd $result
         and builtin commandline --function cancel-commandline repaint
+        and builtin history append "{{ cmd.unwrap_or("cd") }} "(string escape -- $result) &>/dev/null
     end
 end
 complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)'