diff --git a/dot_config/zsh/private_dot_zshrc.tmpl b/dot_config/zsh/private_dot_zshrc.tmpl
index 29fa6a38db6405b2781e54f23ce91c6fb043f06a..615e2d8ab7e849bd325c381ee79cc61345be23b7 100644
--- a/dot_config/zsh/private_dot_zshrc.tmpl
+++ b/dot_config/zsh/private_dot_zshrc.tmpl
@@ -126,8 +126,8 @@ export PATH="$PATH:/usr/lib/kf5"
 
 # Additional preferences
 export LANG=en_GB.UTF-8
-export EDITOR='nvim'
-export VISUAL='nvim'
+export EDITOR='zeditor --wait'
+export VISUAL='zeditor --wait'
 export _JAVA_AWT_WM_NONREPARENTING=1
 export MANPAGER="nvim +Man!"
 export COLUMNS=80