   (define-key! evil-ex-completion-map
     "\C-a" #'move-beginning-of-line
     "\C-b" #'backward-word
-    "\C-f" #'forward-word))
-
-(after! tabulated-list
-  (define-key tabulated-list-mode-map "q" #'quit-window))
-
-(after! view
-  (define-key view-mode-map (kbd "<escape>") #'View-quit-all))
+    "\C-f" #'forward-word)
+
+  (after! view
+    (define-key view-mode-map (kbd "<escape>") #'View-quit-all)))
 
 ;; Restore common editing keys (and ESC) in minibuffer
 (defun +default|fix-minibuffer-in-map (map)
-  (evil-define-key* nil map
-    [escape] #'abort-recursive-edit
+  (define-key! map
     "\C-a" #'move-beginning-of-line
     "\C-w" #'backward-kill-word
     "\C-u" #'backward-kill-sentence

    "\C-f" #'forward-word
    "\C-z" (λ! (ignore-errors (call-interactively #'undo))))
  (when (featurep! :feature evil +everywhere)
    (evil-define-key* nil map
      "\C-r" #'evil-paste-from-register
      "\C-j" #'next-line
      "\C-k" #'previous-line

(unless window-system
  (define-key input-decode-map (kbd "TAB") [tab]))

(after! tabulated-list
  (define-key tabulated-list-mode-map "q" #'quit-window))

(when (featurep! :feature evil +everywhere)
  (evil-define-key* 'insert 'global
    ;; I want C-a and C-e to be a little smarter. C-a will jump to indentation.
    ;; Pressing it again will send you to the true bol. Same goes for C-e,
