diff --git a/init.el b/init.el
index bc676f1..54c3c94 100644
--- a/init.el
+++ b/init.el
@@ -756,6 +756,12 @@ With NO-UPDATE-BAR, don't update any status bar's state."
   :defer nil
   :diminish evil-collection-unimpaired-mode
   :config
+  (setf (plist-get (alist-get 'repl-submit evil-collection-binding-defaults)
+                   :state)
+        '(normal insert)
+        (plist-get (alist-get 'repl-newline evil-collection-binding-defaults)
+                   :enabled)
+        nil)
   (evil-collection-init))
 (use-package evil-surround
   :after evil
@@ -2973,9 +2979,6 @@ Actually, return the method name."
   :custom
   (eshell-history-append t)
   :config
-  (evil-define-key '(normal insert) eshell-mode-map
-    (kbd "RET") #'eshell-send-input
-    (kbd "<return>") #'eshell-send-input)
   (defun my/-eshell-filter-alias-list ()
     (cl-remove-if-not (lambda (elt)
                         (or (string-match-p