diff --git a/.emacs.d/lisp/init-notmuch.el b/.emacs.d/lisp/init-notmuch.el
index dfb9daa8..e83cd52b 100644
--- a/.emacs.d/lisp/init-notmuch.el
+++ b/.emacs.d/lisp/init-notmuch.el
@@ -32,14 +32,7 @@
 (when (require 'patch-helm nil 'noerror)
   (helm-defswitcher
    "notmuch"
-   (lambda (b)
-     (with-current-buffer b
-       (or
-        (derived-mode-p 'notmuch-hello-mode)
-        (derived-mode-p 'notmuch-search-mode)
-        (derived-mode-p 'notmuch-tree-mode)
-        (derived-mode-p 'notmuch-show-mode)
-        (derived-mode-p 'notmuch-message-mode))))
+   #'notmuch-interesting-buffer
    notmuch-hello))
 
 (when (require 'helm-notmuch nil t)