diff --git a/core/core-ui.el b/core/core-ui.el
index 7a8da77ab..afb44c567 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -86,12 +86,13 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.")
 (defvar doom--last-frame nil)
 
 (defun doom|run-switch-window-hooks ()
-  (unless (or doom-inhibit-switch-window-hooks
-              (eq doom--last-window (selected-window))
-              (minibufferp))
-    (let ((doom-inhibit-switch-window-hooks t))
-      (run-hooks 'doom-switch-window-hook)
-      (setq doom--last-window (selected-window)))))
+  (let ((gc-cons-threshold doom-gc-cons-upper-limit))
+    (unless (or doom-inhibit-switch-window-hooks
+                (eq doom--last-window (selected-window))
+                (minibufferp))
+      (let ((doom-inhibit-switch-window-hooks t))
+        (run-hooks 'doom-switch-window-hook)
+        (setq doom--last-window (selected-window))))))
 
 (defun doom|run-switch-frame-hooks (&rest _)
   (unless (or doom-inhibit-switch-frame-hooks
@@ -102,28 +103,28 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.")
       (setq doom--last-frame (selected-frame)))))
 
 (defun doom*run-switch-buffer-hooks (orig-fn buffer-or-name &rest args)
-  (if (or doom-inhibit-switch-buffer-hooks
-          (eq (setq buffer-or-name (get-buffer buffer-or-name))
-              (current-buffer))
-          (and (eq orig-fn 'switch-to-buffer) (car args)))
-      (apply orig-fn buffer-or-name args)
-    (let ((doom-inhibit-switch-buffer-hooks t))
-      (when-let* ((buffer (apply orig-fn buffer-or-name args)))
-        (with-current-buffer
-            (if (windowp buffer)
-                (window-buffer buffer)
-              buffer)
-          (run-hooks 'doom-switch-buffer-hook))
-        buffer))))
+  (let ((gc-cons-threshold doom-gc-cons-upper-limit))
+    (if (or doom-inhibit-switch-buffer-hooks
+            (eq (current-buffer) (get-buffer buffer-or-name))
+            (and (eq orig-fn #'switch-to-buffer) (car args)))
+        (apply orig-fn buffer-or-name args)
+      (let ((doom-inhibit-switch-buffer-hooks t))
+        (when-let* ((buffer (apply orig-fn buffer-or-name args)))
+          (with-current-buffer (if (windowp buffer)
+                                   (window-buffer buffer)
+                                 buffer)
+            (run-hooks 'doom-switch-buffer-hook))
+          buffer)))))
 
 (defun doom*run-switch-to-next-prev-buffer-hooks (orig-fn &rest args)
-  (if doom-inhibit-switch-buffer-hooks
-      (apply orig-fn args)
-    (let ((doom-inhibit-switch-buffer-hooks t))
-      (when-let* ((buffer (apply orig-fn args)))
-        (with-current-buffer buffer
-          (run-hooks 'doom-switch-buffer-hook))
-        buffer))))
+  (let ((gc-cons-threshold doom-gc-cons-upper-limit))
+    (if doom-inhibit-switch-buffer-hooks
+        (apply orig-fn args)
+      (let ((doom-inhibit-switch-buffer-hooks t))
+        (when-let* ((buffer (apply orig-fn args)))
+          (with-current-buffer buffer
+            (run-hooks 'doom-switch-buffer-hook))
+          buffer)))))
 
 (defun doom*run-load-theme-hooks (theme &optional _no-confirm no-enable)
   "Set up `doom-load-theme-hook' to run after `load-theme' is called."
@@ -131,18 +132,6 @@ behavior). Do not set this directly, this is let-bound in `doom|init-theme'.")
     (setq doom-theme theme)
     (run-hooks 'doom-load-theme-hook)))
 
-(defun doom|inhibit-switch-hooks ()
-  "Inhibit all switch hooks (frames, buffers and windows)."
-  (setq doom-inhibit-switch-buffer-hooks t
-        doom-inhibit-switch-window-hooks t
-        doom-inhibit-switch-frame-hooks t))
-
-(defun doom|restore-switch-hooks ()
-  "Uninhibit all switch hooks (frames, buffers and windows)."
-  (setq doom-inhibit-switch-buffer-hooks nil
-        doom-inhibit-switch-window-hooks nil
-        doom-inhibit-switch-frame-hooks nil))
-
 (defun doom|protect-fallback-buffer ()
   "Don't kill the scratch buffer. Meant for `kill-buffer-query-functions'."
   (not (eq (current-buffer) (doom-fallback-buffer))))
@@ -522,11 +511,7 @@ By default, this uses Apple Color Emoji on MacOS and Symbola on Linux."
   (advice-add! '(switch-to-next-buffer switch-to-prev-buffer)
                :around #'doom*run-switch-to-next-prev-buffer-hooks)
   (advice-add! '(switch-to-buffer display-buffer)
-               :around #'doom*run-switch-buffer-hooks)
-  ;; Inhibit switch hookswhile the minibuffer is active, because they can
-  ;; interfere with interactive completion frameworks like ivy, helm, and hydra.
-  (add-hook 'minibuffer-setup-hook #'doom|inhibit-switch-hooks)
-  (add-hook 'minibuffer-exit-hook #'doom|restore-switch-hooks))
+               :around #'doom*run-switch-buffer-hooks))
 
 ;; Apply `doom-theme'
 (if (daemonp)