diff --git a/modules/lang/org/+attach.el b/modules/lang/org/+attach.el
index 94988d99e..564bb02e8 100644
--- a/modules/lang/org/+attach.el
+++ b/modules/lang/org/+attach.el
@@ -15,7 +15,7 @@
 ;; + `+org-attach/url'
 ;; + :org [FILE/URL]
 
-(defvar +org-attach-dir (expand-file-name ".attach/" +org-dir)
+(defvar +org-attach-dir ".attach/"
   "Where to store attachments (relative to current org file).")
 
 
@@ -30,7 +30,7 @@
 
   (advice-add #'org-download-enable :override #'ignore)
   :config
-  (setq-default org-download-image-dir +org-attach-dir
+  (setq-default org-download-image-dir org-attach-directory
                 org-download-heading-lvl nil
                 org-download-timestamp "_%Y%m%d_%H%M%S")
 
@@ -61,12 +61,12 @@
 
 ;;
 (after! org
-  (setq org-attach-directory +org-attach-dir)
+  (setq org-attach-directory (expand-file-name +org-attach-dir +org-dir))
 
   (push (car (last (split-string +org-attach-dir "/" t)))
         projectile-globally-ignored-directories)
 
   (after! recentf
-    (push (format "%s.+$" (regexp-quote +org-attach-dir))
+    (push (format "%s.+$" (regexp-quote org-attach-directory))
           recentf-exclude)))
 
diff --git a/modules/lang/org/autoload/org-attach.el b/modules/lang/org/autoload/org-attach.el
index 0cd9a7380..fa057a016 100644
--- a/modules/lang/org/autoload/org-attach.el
+++ b/modules/lang/org/autoload/org-attach.el
@@ -98,7 +98,7 @@ the cursor."
       (delete-region (match-beginning 0) (match-end 0))
     (newline))
   (cond ((image-type-from-file-name filename)
-         (when (file-in-directory-p filename +org-attach-dir)
+         (when (file-in-directory-p filename org-attach-directory)
            (setq filename (file-relative-name filename +org-dir)))
          (insert
           (concat (if (= org-download-image-html-width 0)
@@ -124,9 +124,7 @@ the cursor."
       (let* ((context (save-match-data (org-element-context)))
              (file (org-link-unescape (org-element-property :path context)))
              (default-directory
-               (if (string-prefix-p
-                    (concat "./" (car (last (split-string +org-attach-dir "/" t))))
-                    file)
+               (if (file-in-directory-p file org-attach-directory)
                    +org-dir
                  default-directory)))
         (apply orig-fn args))