diff --git a/zshenv b/zshenv
index bb12967..aef9ec0 100644
--- a/zshenv
+++ b/zshenv
@@ -152,12 +152,11 @@ export EMACSCLIENT="emacsclient"
 
 # On macOS we want to use the Emacs.app application bundle
 if [[ "$OSTYPE" == "darwin"* ]]; then
-  if [ -f "/Applications/Emacs.app/Contents/MacOS/Emacs" ]; then
+  path_prepend "/Applications/Emacs.app/Contents/MacOS/bin"
+  if [ ! -f "/Applications/Emacs.app/Contents/MacOS/bin/emacs" ] && \
+    [ -f "/Applications/Emacs.app/Contents/MacOS/Emacs" ]; then
     export EMACS="/Applications/Emacs.app/Contents/MacOS/Emacs"
   fi
-  if [ -f "/Applications/Emacs.app/Contents/MacOS/bin/emacsclient" ]; then
-    export EMACSCLIENT="/Applications/Emacs.app/Contents/MacOS/bin/emacsclient"
-  fi
 fi
 
 # Use custom tmux install if available