diff --git a/site-lisp/db-org.el b/site-lisp/db-org.el
index 327005f..608ffef 100644
--- a/site-lisp/db-org.el
+++ b/site-lisp/db-org.el
@@ -1896,7 +1896,8 @@ linking to any item."
                                                            org-agenda-files)))
 
            (scope (cond (use-all-org-files
-                         (append (list (buffer-file-name default-buffer))
+                         (append (unless current-buffer-is-in-org-agenda-files? ; avoid duplicate entries
+                                   (list (buffer-file-name default-buffer)))
                                  (org-agenda-files)
                                  (cl-remove-if-not #'stringp
                                                    org-agenda-text-search-extra-files)))