diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index c83b5f15f..37035a3c6 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -15,7 +15,7 @@
                    ivy-switch-buffer-map))
                 ((featurep! :completion helm)
                  '(helm-map
-                   helm-ag-map
+                   helm-rg-map
                    helm-read-file-map))))
   "A list of all the keymaps used for the minibuffer.")
 
diff --git a/modules/input/layout/+bepo.el b/modules/input/layout/+bepo.el
index 4f62c7fcb..7182c4c31 100644
--- a/modules/input/layout/+bepo.el
+++ b/modules/input/layout/+bepo.el
@@ -67,13 +67,26 @@
   (after! treemacs
     (doom-bepo-rotate-ts-bare-keymap '(evil-treemacs-state-map)))
   (after! (:or helm ivy)
-    (doom-bepo-rotate-bare-keymap +default-minibuffer-maps doom-bepo-cr-rotation-style))
-  (after! company
-    (doom-bepo-rotate-bare-keymap '(company-active-map company-search-map) doom-bepo-cr-rotation-style))
+    (doom-bepo-rotate-bare-keymap
+     '(minibuffer-local-map
+       minibuffer-local-ns-map
+       minibuffer-local-completion-map
+       minibuffer-local-must-match-map
+       minibuffer-local-isearch-map
+       read-expression-map)
+     doom-bepo-cr-rotation-style))
+  (after! ivy
+    (doom-bepo-rotate-bare-keymap '(ivy-minibuffer-map ivy-switch-buffer-map) doom-bepo-cr-rotation-style))
   (after! helm
     (doom-bepo-rotate-bare-keymap '(helm-map) doom-bepo-cr-rotation-style))
+  (after! helm-rg
+    (doom-bepo-rotate-bare-keymap '(helm-rg-map) doom-bepo-cr-rotation-style))
+  (after! helm-files
+    (doom-bepo-rotate-bare-keymap '(helm-read-file-map) doom-bepo-cr-rotation-style))
   (after! general
     (doom-bepo-rotate-evil-keymap doom-bepo-cr-rotation-style))
+  (after! company
+    (doom-bepo-rotate-bare-keymap '(company-active-map company-search-map) doom-bepo-cr-rotation-style))
   (after! evil-snipe
     (doom-bepo--evil-collection-hook
      nil