diff --git a/lisp/org.el b/lisp/org.el
index 66c79f5ed..52ae163f3 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14638,7 +14638,7 @@ a *different* entry, you cannot use these techniques."
        ((eq match nil) (setq matcher t))
        (t (setq matcher (if match (cdr (org-make-tags-matcher match)) t))))
 
-      (save-excursion
+      (save-window-excursion
 	(save-restriction
 	  (cond ((eq scope 'tree)
 		 (org-back-to-heading t)