diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 0e6ab2c..e53b430 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -873,7 +873,7 @@ it.  When it is a variable, retrieve the value.  Return whatever we get."
 (defun org-capture-place-template ()
   "Insert the template at the target location, and display the buffer."
   (org-capture-put :return-to-wconf (current-window-configuration))
-  (delete-other-windows)
+;  (delete-other-windows)
   (org-switch-to-buffer-other-window
    (org-capture-get-indirect-buffer (org-capture-get :buffer) "CAPTURE"))
   (widen)
@@ -1347,8 +1347,8 @@ The template may still contain \"%?\" for cursor positioning."
     (unless template (setq template "") (message "No template") (ding)
 	    (sit-for 1))
     (save-window-excursion
-      (delete-other-windows)
-      (org-pop-to-buffer-same-window (get-buffer-create "*Capture*"))
+;      (delete-other-windows)
+      (org-switch-to-buffer-other-window (get-buffer-create "*Capture*"))
       (erase-buffer)
       (insert template)
       (goto-char (point-min))