diff --git a/templates/cmd.txt b/templates/cmd.txt
index b60d189..0256e8f 100644
--- a/templates/cmd.txt
+++ b/templates/cmd.txt
@@ -140,7 +140,7 @@ set __zoxide_z_prefix={{cmd}}
 
 {%- endmatch %}
 
-@endlocal
+@endlocal & set OLDPWD=
 
 {{ section }}
 @rem To initialize zoxide, add this to your configuration or AutoRun command: