diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a772eb7f1..d3fe006b7 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-07-27  Bastien Guerry  <bzg@altern.org>
 
+	* org.el (org-refile): Bugfix: save-excursion before reading the
+	refile target, otherwise cursor moves might confuse `org-refile'.
+
 	* org-html.el (org-export-as-html): Bugfix: correctly convert the
 	footnote reference before the footnote itself.
 
diff --git a/lisp/org.el b/lisp/org.el
index a0987f7ad..119311a78 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8464,9 +8464,10 @@ See also `org-refile-use-outline-path' and `org-completion-use-ido'"
     (if (equal goto '(16))
 	(org-refile-goto-last-stored)
       (when (setq it (or rfloc
-			 (org-refile-get-location
-			  (if goto "Goto: " "Refile to: ") default-buffer
-			  org-refile-allow-creating-parent-nodes)))
+			 (save-excursion
+			   (org-refile-get-location
+			    (if goto "Goto: " "Refile to: ") default-buffer
+			    org-refile-allow-creating-parent-nodes))))
 	(setq file (nth 1 it)
 	      re (nth 2 it)
 	      pos (nth 3 it))