diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 0f8e8892..260cb200 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -329,11 +329,7 @@ buffers; lets remap its faces so it uses the ones for mu4e."
 \\{message-mode-map}."
   (progn
     (use-local-map mu4e-compose-mode-map)
-
     (mu4e-context-minor-mode)
-    (define-key mu4e-context-minor-mode-map (kbd ";") nil)
-    (define-key mu4e-context-minor-mode-map (kbd "C-c C-;")
-      #'mu4e-compose-context-switch)
 
     (set (make-local-variable 'message-signature) mu4e-compose-signature)
     ;; set this to allow mu4e to work when gnus-agent is unplugged in gnus
diff --git a/mu4e/mu4e-context.el b/mu4e/mu4e-context.el
index 6adf97f1..f6b4847d 100644
--- a/mu4e/mu4e-context.el
+++ b/mu4e/mu4e-context.el
@@ -219,10 +219,6 @@ An empty string \"\" if there is none."
   :global nil
   :init-value nil ;; disabled by default
   :group 'mu4e
-  :keymap
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd ";") #'mu4e-context-switch)
-    map)
   :lighter ""
   (mu4e--modeline-register #'mu4e--context-modeline-item))
 
diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index 9fe37682..9383c0f5 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -916,16 +916,17 @@ after the end of the search results."
   (setq mu4e-headers-mode-map
         (let ((map (make-sparse-keymap)))
 
-          (define-key map "j" 'mu4e~headers-jump-to-maildir)
+          (define-key map "j" #'mu4e~headers-jump-to-maildir)
 
-          (define-key map "q" 'mu4e~headers-quit-buffer)
-          (define-key map "g" 'mu4e-search-rerun) ;; for compatibility
+          (define-key map "q" #'mu4e~headers-quit-buffer)
+          (define-key map "g" #'mu4e-search-rerun) ;; for compatibility
 
-          (define-key map "%" 'mu4e-headers-mark-pattern)
-          (define-key map "t" 'mu4e-headers-mark-subthread)
-          (define-key map "T" 'mu4e-headers-mark-thread)
+          (define-key map "%" #'mu4e-headers-mark-pattern)
+          (define-key map "t" #'mu4e-headers-mark-subthread)
+          (define-key map "T" #'mu4e-headers-mark-thread)
 
           (define-key map "," #'mu4e-sexp-at-point)
+          (define-key map ";" #'mu4e-context-switch)
 
           ;; navigation between messages
           (define-key map "p" 'mu4e-headers-prev)
diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index 6bf58b49..05ba5441 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -931,6 +931,8 @@ This is useful for advising some Gnus-functionality that does not work in mu4e."
     (define-key map (kbd "<insert>")     #'mu4e-view-mark-for-something)
     (define-key map (kbd "<insertchar>") #'mu4e-view-mark-for-something)
 
+    (define-key map ";" #'mu4e-context-switch)
+
     (define-key map (kbd "#") #'mu4e-mark-resolve-deferred-marks)
     ;; misc
     (define-key map "M" #'mu4e-view-massage)