diff --git a/modules/completion/company/config.el b/modules/completion/company/config.el
index a4e53da2d..b1bda000e 100644
--- a/modules/completion/company/config.el
+++ b/modules/completion/company/config.el
@@ -20,7 +20,8 @@
   :config
   (when (featurep! :editor evil)
     (add-hook 'company-mode-hook #'evil-normalize-keymaps)
-
+    ;; Don't persist company popups when switching back to normal mode.
+    (add-hook 'evil-normal-state-entry-hook #'company-abort)
     ;; Allow users to switch between backends on the fly. E.g. C-x C-s followed
     ;; by C-x C-n, will switch from `company-yasnippet' to
     ;; `company-dabbrev-code'.