diff --git a/zsh/zshrc.shared b/zsh/zshrc.shared
index 626a07c4b..1fe06f2ea 100644
--- a/zsh/zshrc.shared
+++ b/zsh/zshrc.shared
@@ -198,6 +198,7 @@ fi
 # we can use nvr.
 if [ ! -z "$NVIM" ]; then
   alias nvim=nvr
+  export EDITOR="nvr -cc split +'set bufhidden=delete' --remote-wait"
 
   excl_plugins=(vi-mode)