@@ -165,6 +165,21 @@ :general ("M-x" #'counsel-M-x))
 
 ;;; Windows
 
+(defun split-window-properly (&optional window)
+    (let ((window (or window (selected-window))))
+    (or (and (window-splittable-p window)
+	     ;; Split window vertically.
+	     (with-selected-window window
+	       (split-window-below)))
+	(and (window-splittable-p window t)
+	     ;; Split window horizontally.
+	     (with-selected-window window
+	       (split-window-right))))))
+
+(setq split-window-preferred-function #'split-window-properly
+      split-height-threshold nil
+      split-width-threshold 160)
+
 (use-package eyebrowse
   :after (evil)
   :custom ((eyebrowse-new-workspace #'counsel-projectile-switch-project)
@@ -284,6 +299,7 @@ :commands (magit-status magit-dispatch)
   :custom ((global-magit-file-mode +1)
            (magit-section-visibility-indicator nil)
            (magit-diff-refine-hunk 'all)
+           (magit-display-buffer-function #'display-buffer)
            (magit-completing-read-function #'ivy-completing-read))
   :config (progn
             (remove-hook 'magit-section-highlight-hook 'magit-section-highlight)