diff --git a/zsh/.zshrc b/zsh/.zshrc
index 308cbb3..cfaa528 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -123,10 +123,11 @@ setopt HIST_REDUCE_BLANKS        # Remove superfluous blanks before recording en
 # Clear screen by ctrl+q
 bindkey '^q' clear-screen
 
-alias vim=nvim
+(( $+commands[nvim] )) && alias vim=nvim
 alias sudo='sudo '
 alias cgrep="grep --color=always"
-export EDITOR='nvim'
+(( $+commands[nvim] )) && export EDITOR='nvim'
+(( $+commands[nvim] )) && export VISUAL='nvim'
 
 # Allow access to all libvirt vms
 export LIBVIRT_DEFAULT_URI="qemu:///system"