diff --git a/modules/feature/syntax-checker/config.el b/modules/feature/syntax-checker/config.el
index 21238960b..e19a4e032 100644
--- a/modules/feature/syntax-checker/config.el
+++ b/modules/feature/syntax-checker/config.el
@@ -2,7 +2,7 @@
 
 (def-package! flycheck
   :commands (flycheck-list-errors flycheck-buffer)
-  :after-call (after-find-file doom-before-switch-buffer)
+  :after-call (doom-enter-buffer-hook after-find-file)
   :config
   ;; Emacs feels snappier without checks on newline
   (setq flycheck-check-syntax-automatically '(save idle-change mode-enabled))
diff --git a/modules/tools/editorconfig/config.el b/modules/tools/editorconfig/config.el
index 5bc85a54a..b4b737039 100644
--- a/modules/tools/editorconfig/config.el
+++ b/modules/tools/editorconfig/config.el
@@ -18,7 +18,7 @@
 ;; specify their own formatting rules.
 (def-package! editorconfig
   :defer 2
-  :after-call (doom-before-switch-buffer after-find-file)
+  :after-call (doom-enter-buffer-hook after-find-file)
   :config
   ;; Register missing indent variables
   (unless (assq 'mips-mode editorconfig-indentation-alist)