diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 780794e..3ae5e0c 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7202,16 +7202,17 @@ use the dedicated frame)."
   (if (and current-prefix-arg (listp current-prefix-arg))
       (org-agenda-do-tree-to-indirect-buffer)
     (let ((agenda-window (selected-window))
-          (indirect-window (get-buffer-window org-last-indirect-buffer)))
+	  (indirect-window 
+	   (get-buffer-window org-last-indirect-buffer)))
       (save-window-excursion (org-agenda-do-tree-to-indirect-buffer))
       (unwind-protect
-          (progn
-            (unless indirect-window
+	  (progn
+            (unless (window-live-p indirect-window)
               (setq indirect-window (split-window agenda-window)))
             (select-window indirect-window)
             (switch-to-buffer org-last-indirect-buffer :norecord)
             (fit-window-to-buffer indirect-window))
-        (select-window agenda-window)))))
+	(select-window (get-buffer-window org-agenda-buffer-name))))))
 
 (defun org-agenda-do-tree-to-indirect-buffer ()
   "Same as `org-agenda-tree-to-indirect-buffer' without saving window."