diff --git a/vim/README b/vim/README
index ff0828ff..9f1ff571 100644
--- a/vim/README
+++ b/vim/README
@@ -30,7 +30,7 @@ Buffer types:
             f       - filter the current search terms
             o       - toggle search screen order
             s       - enter search criteria
-            S       - alter search criteria
+            es      - alter search criteria
             t       - filter the current search terms with tags
             q       - return to folder display, or undo filter
             +       - add tag(s) to selected message
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
index e13ea9f7..2d2f9785 100644
--- a/vim/plugin/notmuch.vim
+++ b/vim/plugin/notmuch.vim
@@ -98,7 +98,7 @@ let g:notmuch_search_maps = {
         \ 'o':          ':call <SID>NM_search_toggle_order()<CR>',
         \ 'r':          ':call <SID>NM_search_reply_to_thread()<CR>',
         \ 's':          ':call <SID>NM_search_prompt()<CR>',
-        \ 'S':          ':call <SID>NM_search_edit()<CR>',
+        \ ',s':         ':call <SID>NM_search_edit()<CR>',
         \ 't':          ':call <SID>NM_search_filter_by_tag()<CR>',
         \ 'q':          ':call <SID>NM_kill_this_buffer()<CR>',
         \ '+':          ':call <SID>NM_search_add_tags([])<CR>',