diff --git a/src/IDF/templates/idf/base-simple.html b/src/IDF/templates/idf/base-simple.html
index 4358844..40d56be 100644
--- a/src/IDF/templates/idf/base-simple.html
+++ b/src/IDF/templates/idf/base-simple.html
@@ -54,6 +54,7 @@
   <div id="ft">{block foot}<a href="http://www.indefero.net" title="InDefero, bug tracking and more"><img src="{media '/idf/img/powered-by-indefero.png'}" alt="InDefero Logo" /></a>{/block}</div>
 </div>
 <script type="text/javascript" src="{media '/idf/js/jquery-1.2.6.min.js'}"></script>
+{include 'idf/js-hotkeys.html'}
 {block javascript}{/block}
 </body>
 </html>
diff --git a/src/IDF/templates/idf/faq.html b/src/IDF/templates/idf/faq.html
index ad889ad..39f2517 100644
--- a/src/IDF/templates/idf/faq.html
+++ b/src/IDF/templates/idf/faq.html
@@ -9,17 +9,21 @@
 
 <h2 id="q-keyboard">{trans 'What are the keyboard shortcuts?'}</h2>
 
+<ul>
+<li>{trans '<kbd>Shift+h</kbd>: This help page.'}</li>
+</ul>
+
 <p>{trans 'If you are in a project, you have the following shortcuts:'}</p>
 
 <ul>
-<li>{trans '<kbd>Shift+h</kbd>: Project home.'}</li>
 <li>{trans '<kbd>Shift+u</kbd>: Project updates.'}</li>
 <li>{trans '<kbd>Shift+d</kbd>: Downloads.'}</li>
-<li>{trans '<kbd>Shift+s</kbd>: Source.'}</li>
+<li>{trans '<kbd>Shift+o</kbd>: Documentation.'}</li>
 <li>{trans '<kbd>Shift+a</kbd>: Create a new issue.'}</li>
 <li>{trans '<kbd>Shift+i</kbd>: List of open issues.'}</li>
 <li>{trans '<kbd>Shift+m</kbd>: The issues you submitted.'}</li>
 <li>{trans '<kbd>Shift+w</kbd>: The issues assigned to you.'}</li>
+<li>{trans '<kbd>Shift+s</kbd>: Source.'}</li>
 </ul>
 
 <p>{trans 'You also have the standard access keys:'}</p>
diff --git a/src/IDF/templates/idf/js-hotkeys.html b/src/IDF/templates/idf/js-hotkeys.html
index a41dea6..ee39cac 100644
--- a/src/IDF/templates/idf/js-hotkeys.html
+++ b/src/IDF/templates/idf/js-hotkeys.html
@@ -1,16 +1,17 @@
 <script type="text/javascript" src="{media '/idf/js/jquery.hotkeys.js'}"></script>
-{if $project}
 <script type="text/javascript" charset="utf-8">
 // <!--
-{hotkey 'Shift+h', 'IDF_Views_Project::home', array($project.shortname)}
+{hotkey 'Shift+h', 'IDF_Views::faq'}
+{if $project}
 {hotkey 'Shift+u', 'IDF_Views_Project::timeline', array($project.shortname)}
 {if $hasIssuesAccess}{hotkey 'Shift+a', 'IDF_Views_Issue::create', array($project.shortname)}
 {hotkey 'Shift+i', 'IDF_Views_Issue::index', array($project.shortname)}{/if}
 {if $hasDownloadsAccess}{hotkey 'Shift+d', 'IDF_Views_Download::index', array($project.shortname)}{/if}
+{if $hasWikiAccess}{hotkey 'Shift+o', 'IDF_Views_Wiki::index', array($project.shortname)}{/if}
 {if $hasSourceAccess}{hotkey 'Shift+s', 'IDF_Views_Source::treeBase', array($project.shortname, $project.getScmRoot())}{/if}
 {if $hasIssuesAccess and !$user.isAnonymous()}
 {hotkey 'Shift+m', 'IDF_Views_Issue::myIssues', array($project.shortname, 'submit')}
 {hotkey 'Shift+w', 'IDF_Views_Issue::myIssues', array($project.shortname, 'owner')}
-{/if} //-->
+{/if}{/if} //-->
 </script>
-{/if}
+