diff --git a/modules/editor/file-templates/config.el b/modules/editor/file-templates/config.el
index 2ef1d1f3f..27e580e89 100644
--- a/modules/editor/file-templates/config.el
+++ b/modules/editor/file-templates/config.el
@@ -142,14 +142,10 @@ must be non-read-only, empty, and there must be a rule in
        (not (member (substring (buffer-name) 0 1) '("*" " ")))
        (not (file-exists-p buffer-file-name))
        (not (buffer-modified-p))
+       (null (buffer-base-buffer))
        (when-let (rule (cl-find-if #'+file-template-p +file-templates-alist))
          (apply #'+file-templates--expand rule))))
 
-(defadvice! +file-templates-inhibit-in-org-capture-a (fn &rest args)
-  :around #'org-capture
-  (let ((+file-templates-inhibit t))
-    (apply fn args)))
-
 
 ;;
 ;;; Bootstrap