diff --git a/modules/completion/company/config.el b/modules/completion/company/config.el
index f983ddb0e..c74963b4b 100644
--- a/modules/completion/company/config.el
+++ b/modules/completion/company/config.el
@@ -34,17 +34,20 @@ MODES should be one major-mode symbol or a list of them."
         company-dabbrev-code-other-buffers t
         company-tooltip-align-annotations t
         company-require-match 'never
-        company-global-modes '(not eshell-mode comint-mode erc-mode message-mode help-mode gud-mode)
-        company-frontends '(company-pseudo-tooltip-frontend company-echo-metadata-frontend)
-        company-backends '(company-capf company-dabbrev company-ispell company-yasnippet)
+        company-global-modes
+        '(not eshell-mode comint-mode erc-mode message-mode help-mode gud-mode)
+        company-frontends
+        '(company-pseudo-tooltip-unless-just-one-frontend
+          company-echo-metadata-frontend)
+        company-backends
+        '(company-capf company-dabbrev company-ispell company-yasnippet)
         company-transformers '(company-sort-by-occurrence))
+  (when (featurep! +auto)
+    (require 'company)
+    (setq company-idle-delay 0.2))
   :config
   (global-company-mode +1))
 
-(when (featurep! +auto)
-  (require 'company)
-  (setq company-idle-delay 0.2))
-
 
 (def-package! company-statistics
   :after company