diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index 2deee42e..386fef58 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -966,11 +966,9 @@ The arguments are:
 
 
 ;; Set up key bindings from the rest of notmuch.
-(define-key notmuch-search-mode-map "z" 'notmuch-pick)
+(define-key notmuch-common-keymap "z" 'notmuch-pick)
 (define-key notmuch-search-mode-map "Z" 'notmuch-pick-from-search-current-query)
 (define-key notmuch-search-mode-map (kbd "M-RET") 'notmuch-pick-from-search-thread)
-(define-key notmuch-hello-mode-map "z" 'notmuch-pick-from-hello)
-(define-key notmuch-show-mode-map "z" 'notmuch-pick)
 (define-key notmuch-show-mode-map "Z" 'notmuch-pick-from-show-current-query)
 (notmuch-pick-setup-show-out)
 (message "Initialised notmuch-pick")