diff --git a/org-roam-capture.el b/org-roam-capture.el
index 0c66f12..100eea4 100644
--- a/org-roam-capture.el
+++ b/org-roam-capture.el
@@ -528,15 +528,15 @@ also run Org-capture's template expansion."
 (defun org-roam-capture--goto-location ()
   "Initialize the buffer, and goto the location of the new capture.
 Return the ID of the location."
-  (let (p)
+  (let (p new-file-p)
     (pcase (or (org-roam-capture--get :if-new)
                (user-error "Template needs to specify `:if-new'"))
       (`(file ,path)
        (setq path (expand-file-name
                    (string-trim (org-roam-capture--fill-template path t))
                    org-roam-directory))
-       (unless (file-exists-p path)
-         (org-roam-capture--put :new-file path))
+       (setq new-file-p (not (org-find-base-buffer-visiting path)))
+       (when new-file-p (org-roam-capture--put :new-file path))
        (set-buffer (org-capture-target-buffer path))
        (widen)
        (setq p (goto-char (point-min))))
@@ -544,9 +544,9 @@ Return the ID of the location."
        (setq path (expand-file-name
                    (string-trim (org-roam-capture--fill-template path t))
                    org-roam-directory))
+       (setq new-file-p (not (org-find-base-buffer-visiting path)))
+       (when new-file-p (org-roam-capture--put :new-file path))
        (set-buffer (org-capture-target-buffer path))
-       (unless (file-exists-p path)
-         (org-roam-capture--put :new-file path))
        (setq p (point-min))
        (let ((m (org-roam-capture-find-or-create-olp olp)))
          (goto-char m))
@@ -555,8 +555,9 @@ Return the ID of the location."
        (setq path (expand-file-name
                    (string-trim (org-roam-capture--fill-template path t))
                    org-roam-directory))
+       (setq new-file-p (not (org-find-base-buffer-visiting path)))
        (set-buffer (org-capture-target-buffer path))
-       (unless (file-exists-p path)
+       (when new-file-p
          (org-roam-capture--put :new-file path)
          (insert (org-roam-capture--fill-template head t)))
        (widen)
@@ -565,9 +566,10 @@ Return the ID of the location."
        (setq path (expand-file-name
                    (string-trim (org-roam-capture--fill-template path t))
                    org-roam-directory))
-       (widen)
+       (setq new-file-p (not (org-find-base-buffer-visiting path)))
        (set-buffer (org-capture-target-buffer path))
-       (unless (file-exists-p path)
+       (widen)
+       (when new-file-p
          (org-roam-capture--put :new-file path)
          (insert (org-roam-capture--fill-template head t)))
        (setq p (point-min))