diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index b88300234..a7a309852 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -745,22 +745,13 @@
 ;;
 
 (when (featurep 'evil-collection)
-  ;; don't interfere with leader key
-  (evil-define-key* '(normal visual) special-mode-map (kbd doom-leader-key) nil)
-  (after! dired
-    (evil-define-key* 'normal dired-mode-map (kbd doom-leader-key) nil))
-
-  ;; don't remap gd or K; Doom does this already
-  ;; TODO find a better way
-  (after! compile
-    (evil-define-key* '(normal visual) compilation-mode-map "gd" nil "K" nil))
-  (after! racer
-    (evil-define-key* 'normal racer-mode-map "gd" nil "K" nil))
-  (after! anaconda-mode
-    (evil-define-key* 'normal anaconda-mode-map "gd" nil "K" nil))
-  (after! alchemist
-    (evil-define-key* 'normal alchemist-mode-map "gd" nil "K" nil "gz" nil))
-  (after! go-mode
-    (evil-define-key* 'normal go-mode-map "gd" nil "K" nil))
-  (after! lua-mode
-    (evil-define-key* 'normal lua-mode-map "K" nil)))
+  (defun +config|deal-with-evil-collections-bs (feature keymaps)
+    "Unmap keys that conflict with Doom's defaults."
+    (dolist (map keymaps)
+      (evil-define-key '(normal visual motion) map
+        doom-leader-key nil
+        "C-j" nil "C-k" nil
+        "gd" nil "gf" nil
+        "K"  nil
+        "]"  nil "["  nil)))
+  (add-hook 'evil-collection-setup-hook #'+config|deal-with-evil-collections-bs))