diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index d56dc5f..ee94c39 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -561,7 +561,7 @@ use.  If MODE is not nil, open a new buffer with the name
         (when (fboundp mode-sym)
           (funcall mode-sym))))
 
-    (switch-to-buffer buffer)))
+    (select-window (display-buffer buffer))))
 
 (defun oni:reload-buffer ()
   "Reload current buffer."
@@ -1067,6 +1067,9 @@ for easy selection."
 
 (add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
 
+(add-to-list 'display-buffer-alist
+             '("^\\*.*\\*$" . ((bw-display-in-bottom-window . nil))))
+
 (unless (oni:required-packages-installed-p)
   (message "%s" "Refreshing package database...")
   (package-refresh-contents)