diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index f9fe28220..0873bea44 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -480,9 +480,19 @@ To change these keys see `+evil-repeat-keys'."
         :nv "gr"  #'+eval:region
         :n  "gR"  #'+eval/buffer
         :v  "gR"  #'+eval:replace-region
+        ;; Restore these keybinds, since the blacklisted/overwritten gr/gR will
+        ;; undo them:
         (:after dired
           :map dired-mode-map
-          :n "gr" #'revert-buffer))
+          :n "gr" #'revert-buffer)
+        (:after notmuch
+          :map notmuch-common-keymap
+          :n "gr" #'notmuch-refresh-this-buffer
+          :n "gR" #'notmuch-poll-and-refresh-this-buffer)
+        (:after elfeed
+          :map elfeed-search-update--force
+          :n "gr" #'elfeed-search-update--force
+          :n "gR" #'elfeed-search-fetch))
 
       :nv "z="    #'flyspell-correct-word-generic
       ;; custom evil keybinds