diff --git a/init.zsh b/init.zsh
index b79e6f0..9f9e480 100644
--- a/init.zsh
+++ b/init.zsh
@@ -75,11 +75,11 @@ elif [[ -v INSIDE_EMACS ]]; then
     alias dired='emacsclient '
     alias d='emacsclient '
 else
-    export EDITOR='emacsclient -nw'
+    export EDITOR='emacsclient -a nvim -nw'
     # Because I keep using n by mistake
-    alias n='emacsclient -nw '
-    alias e='emacsclient -nw '
-    alias emacs='emacsclient -nw '
+    alias emacs='emacsclient -a nvim -nw '
+    alias n=emacs
+    alias e=emacs
     function dired() {
         if (( ${#} == 0 )); then
             emacsclient -nw --eval '(dired ".")'