diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index e882011c6..d0664a491 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -475,13 +475,18 @@ Continues comments if executed from a commented line. Consults
          `(menu-item "Insert completion DWIM" corfu-insert
            :filter ,(lambda (cmd)
                       (cond ((null +corfu-want-ret-to-confirm)
-                             (corfu-quit))
-                            ((or (not (minibufferp nil t))
-                                 (eq +corfu-want-ret-to-confirm t))
-                             (when (>= corfu--index 0) cmd))
+                             (corfu-quit)
+                             nil)
                             ((eq +corfu-want-ret-to-confirm 'minibuffer)
                              (funcall-interactively cmd)
                              nil)
+                            ((and (or (not (minibufferp nil t))
+                                      (eq +corfu-want-ret-to-confirm t))
+                                  (>= corfu--index 0))
+                             cmd)
+                            ((or (not (minibufferp nil t))
+                                 (eq +corfu-want-ret-to-confirm t))
+                             nil)
                             (t cmd)))))
         (cmds-tab
          `(menu-item "Select next candidate or expand/traverse snippet" corfu-next