diff --git a/init.el b/init.el
index d581c86..bc21ac5 100644
--- a/init.el
+++ b/init.el
@@ -694,7 +694,8 @@
                                    (eglot-capf (styles . (styles orderless))))))
 
 (use-package corfu
-  :defines corfu-map
+  :defines (corfu-map
+            corfu-mode-map)
   :functions (global-corfu-mode
               corfu-history-mode)
   :bind ( :map corfu-map
@@ -715,12 +716,13 @@
   (defun my/local-corfu-no-auto () (setq-local corfu-auto nil))
   (with-eval-after-load 'eshell (add-hook 'eshell-mode-hook 'my/local-corfu-no-auto))
   (with-eval-after-load 'shell (add-hook 'shell-mode-hook 'my/local-corfu-no-auto))
-  (with-eval-after-load 'gud (add-hook 'gud-mode-hook 'my/local-corfu-no-auto)))
+  (with-eval-after-load 'gud (add-hook 'gud-mode-hook 'my/local-corfu-no-auto))
+  (global-corfu-mode +1))
 
 (use-package corfu-popupinfo
   :requires corfu
   :functions corfu-popupinfo-mode
-  :bind ( :map corfu-map
+  :bind ( :map corfu-mode-map
           ("M-d" . corfu-popupinfo-toggle)
           ("M-n" . corfu-popupinfo-scroll-up)
           ("M-p" . corfu-popupinfo-scroll-down))