(unless inhibit-wconf-store
     (org-capture-put :return-to-wconf (current-window-configuration)))
   (delete-other-windows)
-  (org-switch-to-buffer-other-window
-   (org-capture-get-indirect-buffer (org-capture-get :buffer) "CAPTURE"))
+  (org-no-popups
+   (switch-to-buffer
+    (org-capture-get-indirect-buffer (org-capture-get :buffer) "CAPTURE")))
   (widen)
   (outline-show-all)
   (goto-char (org-capture-get :pos))