diff --git a/init.zsh b/init.zsh
index ab247c7..a07cd2e 100644
--- a/init.zsh
+++ b/init.zsh
@@ -99,9 +99,9 @@ elif [[ -v INSIDE_EMACS ]]; then
     alias e='emacsclient '
     alias emacs='emacsclient '
     alias n='emacsclient '
-elif [[ -v DISTROBOX_ENTER_PATH ]]; then
-    export EDITOR='emacsclient -a nvim -c'
-    alias emacs='emacsclient -a nvim -c '
+elif cmd_exists distrobox-host-exec; then
+    export EDITOR='distrobox-host-exec emacsclient -a nvim -c'
+    alias emacs='distrobox-host-exec emacsclient -a nvim -c '
     alias n='emacs '
     alias e='emacs '
 else