diff --git a/lisp/org-remember.el b/lisp/org-remember.el
index ae83bec..193eaec 100644
--- a/lisp/org-remember.el
+++ b/lisp/org-remember.el
@@ -586,6 +586,8 @@ to be run from that hook to function properly."
 	      (let*
 		  ((prop (org-substring-no-properties prompt))
 		   (pall (concat prop "_ALL"))
+                   (file-buffer (or (find-buffer-visiting file)
+                                    (find-file-noselect file)))
 		   (allowed
 		    (with-current-buffer
 			(or (find-buffer-visiting file) (current-buffer))
@@ -593,7 +595,7 @@ to be run from that hook to function properly."
 			  (cdr (assoc pall org-global-properties))
 			  (cdr (assoc pall org-global-properties-fixed)))))
 		   (existing (with-current-buffer
-				 (get-buffer (file-name-nondirectory file))
+				 file-buffer
 			       (mapcar 'list (org-property-values prop))))
 		   (propprompt (concat "Value for " prop ": "))
 		   (val (if allowed