diff --git a/CHANGELOG.md b/CHANGELOG.md
index 899316b3..8431635a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - fish: detect infinite loop when using `alias cd=z`.
-- fish / PowerShell: handle queries that look like args (e.g. `z -x`).
+- fish / Nushell / PowerShell: handle queries that look like args (e.g. `z -x`).
 
 ## [0.9.4] - 2024-02-21
 
diff --git a/templates/nushell.txt b/templates/nushell.txt
index a5244d61..a9343643 100644
--- a/templates/nushell.txt
+++ b/templates/nushell.txt
@@ -39,7 +39,7 @@ if (not ($env | default false __zoxide_hooked | get __zoxide_hooked)) {
 #
 
 # Jump to a directory using only keywords.
-def --env __zoxide_z [...rest:string] {
+def --env --wrapped __zoxide_z [...rest:string] {
   let arg0 = ($rest | append '~').0
   let path = if (($rest | length) <= 1) and ($arg0 == '-' or ($arg0 | path expand | path type) == dir) {
     $arg0
@@ -53,7 +53,7 @@ def --env __zoxide_z [...rest:string] {
 }
 
 # Jump to a directory using interactive search.
-def --env __zoxide_zi [...rest:string] {
+def --env --wrapped __zoxide_zi [...rest:string] {
   cd $'(zoxide query --interactive -- ...$rest | str trim -r -c "\n")'
 {%- if echo %}
   echo $env.PWD