diff --git a/bin/doom b/bin/doom
index 9da3f4c96..d2dfce4f1 100755
--- a/bin/doom
+++ b/bin/doom
@@ -12,7 +12,10 @@
 (let* ((loaddir (file-name-directory (file-truename load-file-name)))
        (emacsdir (getenv "EMACSDIR"))
        (user-emacs-directory
-        (abbreviate-file-name (or emacsdir (expand-file-name "../" loaddir)))))
+        (abbreviate-file-name
+         (if emacsdir
+             (file-name-as-directory emacsdir)
+           (expand-file-name "../" loaddir)))))
 
   ;;
   (load (expand-file-name "core/core.el" user-emacs-directory) nil t)