diff --git a/hledger-web/static/hledger.js b/hledger-web/static/hledger.js
index e5f6098a4..1110a9495 100644
--- a/hledger-web/static/hledger.js
+++ b/hledger-web/static/hledger.js
@@ -14,13 +14,13 @@ $(document).ready(function() {
 
   // keyboard shortcuts
   // 'body' seems to hold focus better than document in FF
-  $('body').bind('keydown', 'shift+/', function(){ $('#helpmodal').modal('toggle'); return false; });
   $('body').bind('keydown', 'h',       function(){ $('#helpmodal').modal('toggle'); return false; });
+  $('body').bind('keydown', 'shift+/', function(){ $('#helpmodal').modal('toggle'); return false; });
   $('body').bind('keydown', 'j',       function(){ location.href = '/journal'; return false; });
   $('body').bind('keydown', 's',       function(){ sidebarToggle(); return false; });
   $('body').bind('keydown', 'a',       function(){ addformShow(); return false; });
   $('body').bind('keydown', 'n',       function(){ addformShow(); return false; });
-  $('body').bind('keydown', '/',       function(){ $('#searchform input').focus(); return false; });
+  $('body').bind('keydown', 'f',       function(){ $('#searchform input').focus(); return false; });
   $('body, #addform input, #addform select').bind('keydown', 'ctrl+shift+=', addformAddPosting);
   $('body, #addform input, #addform select').bind('keydown', 'ctrl+=',       addformAddPosting);
   $('body, #addform input, #addform select').bind('keydown', 'ctrl+-',       addformDeletePosting);
diff --git a/hledger-web/templates/default-layout-wrapper.hamlet b/hledger-web/templates/default-layout-wrapper.hamlet
index 03909589c..32232bf02 100644
--- a/hledger-web/templates/default-layout-wrapper.hamlet
+++ b/hledger-web/templates/default-layout-wrapper.hamlet
@@ -59,11 +59,11 @@ $newline never
                     <p>
                       <b>Keyboard shortcuts
                       <ul>
-                        <li> <b><tt>h</tt></b> or <b><tt>?</tt></b> - view this help (escape or click to exit)
+                        <li> <b><tt>h</tt></b> or maybe <b><tt>?</tt></b> - view this help (escape or click to exit)
                         <li> <b><tt>j</tt></b> - go to the Journal view (home)
                         <li> <b><tt>a</tt></b> - add a transaction (escape to cancel)
                         <li> <b><tt>s</tt></b> - toggle sidebar
-                        <li> <b><tt>/</tt></b> or <b><tt>ctrl-s</tt></b> - focus search form
+                        <li> <b><tt>f</tt></b> - focus search form ("find")
                     <p>
                       <b>General
                       <ul>