diff --git a/init.el b/init.el
index 602bc4c..78b3d23 100644
--- a/init.el
+++ b/init.el
@@ -1630,31 +1630,34 @@ Note that this workaround is incomplete, as explained in this comment."
              magit-list-repositories)
 
   :init (progn
-          (setq magit-diff-refine-hunk nil
-                magit-commit-show-diff nil
-                magit-repository-directories '(("~/" . 0)
-                                               ("~/.emacs.d" . 0)
-                                               ("~/Documents/" . 3)
-                                               ("~/.local/share/dotfiles" . 0))
-                magit-repolist-columns '(("Name" 20 magit-repolist-column-ident
-                                          ())
-                                         ("S" 1 magit-repolist-column-flag
-                                          ())
-                                         ("B<U" 3 magit-repolist-column-unpulled-from-upstream
-                                          ((:right-align t)
-                                           (:sort <)))
-                                         ("B>U" 3 magit-repolist-column-unpushed-to-upstream
-                                          ((:right-align t)
-                                           (:sort <)))
-                                         ("Version" 35 magit-repolist-column-version
-                                          ((:sort magit-repolist-version<)))
-                                         ("Path" 99 magit-repolist-column-path
-                                          ())))
+          (setopt magit-diff-refine-hunk nil
+                  magit-commit-show-diff nil
+
+                  magit-repository-directories '(("~/" . 0)
+                                                 ("~/.emacs.d" . 0)
+                                                 ("~/Documents/" . 3)
+                                                 ("~/.local/share/dotfiles" . 0))
+
+                  magit-repolist-columns '(("Name" 20 magit-repolist-column-ident
+                                            ())
+                                           ("S" 1 magit-repolist-column-flag
+                                            ())
+                                           ("B<U" 3 magit-repolist-column-unpulled-from-upstream
+                                            ((:right-align t)
+                                             (:sort <)))
+                                           ("B>U" 3 magit-repolist-column-unpushed-to-upstream
+                                            ((:right-align t)
+                                             (:sort <)))
+                                           ("Version" 35 magit-repolist-column-version
+                                            ((:sort magit-repolist-version<)))
+                                           ("Path" 99 magit-repolist-column-path
+                                            ()))
+
+                  magit-branch-direct-configure nil)
 
           (when on-windows
-            ;; Experimental: on Windows, do not refresh magit-status-buffers
-            ;; that are not selected, to increase performance.
-            (setq magit-refresh-status-buffer nil)))
+            ;; Increase performance by not automatically refreshing status buffers
+            (setopt magit-refresh-status-buffer nil)))
 
   :config (progn
             (when (fboundp 'global-magit-file-mode)