diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index a939ca734..dfcd64be0 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -150,15 +150,18 @@
 
       (:when (featurep! :completion helm)
         (:after helm :map helm-map
+          [remap next-line]     #'helm-next-line
+          [remap previous-line] #'helm-previous-line
           [left]     #'left-char
           [right]    #'right-char
           "C-S-f"    #'helm-previous-page
           "C-S-n"    #'helm-next-source
           "C-S-p"    #'helm-previous-source
-          "C-S-j"    #'helm-next-source
-          "C-S-k"    #'helm-previous-source
-          "C-j"      #'helm-next-line
-          "C-k"      #'helm-previous-line
+          (:when (featurep! :editor evil +everywhere)
+            "C-j"    #'helm-next-line
+            "C-k"    #'helm-previous-line
+            "C-S-j"  #'helm-next-source
+            "C-S-k"  #'helm-previous-source)
           "C-u"      #'helm-delete-minibuffer-contents
           "C-s"      #'helm-minibuffer-history
           ;; Swap TAB and C-z