diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el
index 48448b2fa..41e54d945 100644
--- a/modules/completion/corfu/config.el
+++ b/modules/completion/corfu/config.el
@@ -6,7 +6,6 @@
 ;;
 ;;; Packages
 (use-package! corfu
-  :defer t
   :hook (doom-first-input . global-corfu-mode)
   :config
   (setq corfu-auto t
diff --git a/modules/config/default/+emacs-bindings.el b/modules/config/default/+emacs-bindings.el
index ab29c5977..2402e7885 100644
--- a/modules/config/default/+emacs-bindings.el
+++ b/modules/config/default/+emacs-bindings.el
@@ -542,7 +542,7 @@
        (:map corfu-mode-map
         "C-M-i" #'completion-at-point)
        (:map corfu-popupinfo-map
-         "C-S-h" #'corfu-popupinfo-toggle))
+        "C-S-h" #'corfu-popupinfo-toggle))
 
       ;;; ein notebooks
       (:after ein:notebook-multilang
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index 0a715a35b..cc28cdbe6 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -467,7 +467,7 @@ Continues comments if executed from a commented line. Consults
          "C-p" #'corfu-previous
          "C-n" #'corfu-next
          (:when (modulep! :completion corfu +orderless)
-          "<remap> <completion-at-point>" #'+corfu-smart-sep-toggle-escape)
+          [remap completion-at-point] #'+corfu-smart-sep-toggle-escape)
          (:when (modulep! :completion corfu +tng)
           [tab] #'corfu-next
           "TAB" #'corfu-next
@@ -482,14 +482,14 @@ Continues comments if executed from a commented line. Consults
          "C-S-u" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-down corfu-popupinfo-min-height))
          "C-S-d" (cmd! (funcall-interactively #'corfu-popupinfo-scroll-up corfu-popupinfo-min-height)))
         (:map corfu-map
-         :gi "C-<return>" '(menu-item "Conclude the minibuffer" exit-minibuffer
-                            :enable (active-minibuffer-window))
-         :gi "S-<return>" '(menu-item "Insert completion and conclude" +corfu-complete-and-exit-minibuffer
-                            :enable (active-minibuffer-window))))
+         "C-<return>" '(menu-item "Conclude the minibuffer" exit-minibuffer
+                        :enable (minibufferp nil t))
+         "S-<return>" '(menu-item "Insert completion and conclude" +corfu-complete-and-exit-minibuffer
+                        :enable (minibufferp nil t))))
   (when-let ((cmds-del (and (modulep! :completion corfu +tng)
-                            (cmds! (and (> corfu--index -1)
-                                        (eq corfu-preview-current 'insert))
-                                   #'corfu-reset))))
+                            '(menu-item "Reset completion" #'corfu-reset
+                              :enable (and (> corfu--index -1)
+                                           (eq corfu-preview-current 'insert))))))
     (map! :after corfu
           :map corfu-map
           [backspace] cmds-del