diff --git a/elisp/org-mu4e-compose.el b/elisp/org-mu4e-compose.el
index 9aff8dc..f02a1aa 100644
--- a/elisp/org-mu4e-compose.el
+++ b/elisp/org-mu4e-compose.el
@@ -578,35 +578,29 @@ This is derived from `org-mode', but it also essentially runs
 ;; ########################
 ;; # Global override mode #
 ;; ########################
-(defun org-mu4e--make-override-keymap (parent)
-  "Create and return new override keymap for PARENT.
-An override keymap is the same as PARENT except that it remaps certain mu4e
-functions to their org-mu4e equivalents."
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map parent)
-    (define-key map [remap mu4e-compose-new] #'org-mu4e-compose-new)
-    (define-key map [remap mu4e-compose-forward] #'org-mu4e-compose-forward)
-    (define-key map [remap mu4e-compose-reply] #'org-mu4e-compose-reply)
-    (define-key map [remap mu4e-compose-reply-to] #'org-mu4e-compose-reply-to)
-    (define-key map [remap mu4e-compose-wide-reply]
-                #'org-mu4e-compose-wide-reply)
-    (define-key map [remap mu4e-compose-edit] #'org-mu4e-compose-edit)
-    map))
+(defvar-keymap org-mu4e--override-keymap
+  :doc "Keymap used by org-mu4e override modes."
+  "<remap> <mu4e-compose-new>" #'org-mu4e-compose-new
+  "<remap> <mu4e-compose-forward>" #'org-mu4e-compose-forward
+  "<remap> <mu4e-compose-reply>" #'org-mu4e-compose-reply
+  "<remap> <mu4e-compose-reply-to>" #'org-mu4e-compose-reply-to
+  "<remap> <mu4e-compose-wide-reply>" #'org-mu4e-compose-wide-reply
+  "<remap> <mu4e-compose-edit>" #'org-mu4e-compose-edit)
 
 (define-minor-mode org-mu4e--main-override-mode
   "Minor mode to replace key bindings in `mu4e-headers-mode'."
   :interactive nil
-  :keymap (org-mu4e--make-override-keymap mu4e-main-mode-map))
+  :keymap org-mu4e--override-keymap)
 
 (define-minor-mode org-mu4e--headers-override-mode
   "Minor mode to replace key bindings in `mu4e-headers-mode'."
   :interactive nil
-  :keymap (org-mu4e--make-override-keymap mu4e-headers-mode-map))
+  :keymap org-mu4e--override-keymap)
 
 (define-minor-mode org-mu4e--view-override-mode
   "Minor mode to replace key bindings in `mu4e-headers-mode'."
   :interactive nil
-  :keymap (org-mu4e--make-override-keymap mu4e-view-mode-map))
+  :keymap org-mu4e--override-keymap)
 
 (defun org-mu4e--enable-override-mode ()
   "Enable `org-mu4e-override-mode'."