diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 3ba8842..ff9eeb0 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -154,8 +154,11 @@
 When your shell is Emacs, your Emacs is but an oyster...
 This is taken from a website that I can't remember at the moment."
     (if (null args) (bury-buffer)
-      (mapc #'find-file-other-window
-	    (mapcar #'expand-file-name (flatten-tree (reverse args))))))
+      (let ((open-func (if (one-window-p)
+			   #'find-file-other-window
+			 #'find-file)))
+	(mapc open-func
+	      (mapcar #'expand-file-name (flatten-tree (reverse args)))))))
   (defun mitch/eshell-setup-keys ()
     (evil-collection-define-key
       'normal