diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js
index ab8b709cd..659245c07 100644
--- a/src/public/javascripts/desktop.js
+++ b/src/public/javascripts/desktop.js
@@ -103,6 +103,10 @@ $("#logout-button").click(() => {
 
 $("#tree").on("click", ".unhoist-button", hoistedNoteService.unhoist);
 
+$("body").on("click", "a.external", function () {
+    window.open($(this).attr("href"), '_blank');
+});
+
 if (utils.isElectron()) {
     require('electron').ipcRenderer.on('create-day-sub-note', async function(event, parentNoteId) {
         // this might occur when day note had to be created
diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/javascripts/services/entrypoints.js
index 8da3cd1b9..884f8a8b0 100644
--- a/src/public/javascripts/services/entrypoints.js
+++ b/src/public/javascripts/services/entrypoints.js
@@ -56,7 +56,7 @@ function registerEntrypoints() {
     $("#options-button").click(optionsDialog.showDialog);
 
     $("#show-help-button").click(helpDialog.showDialog);
-    utils.bindShortcut('alt+h', helpDialog.showDialog);
+    utils.bindShortcut('f1', helpDialog.showDialog);
 
     $("#open-sql-console-button").click(sqlConsoleDialog.showDialog);
     utils.bindShortcut('alt+o', sqlConsoleDialog.showDialog);
diff --git a/src/views/dialogs/help.ejs b/src/views/dialogs/help.ejs
index d9b4e8e71..a9766545d 100644
--- a/src/views/dialogs/help.ejs
+++ b/src/views/dialogs/help.ejs
@@ -1,15 +1,80 @@
 <div id="help-dialog" class="modal mx-auto" tabindex="-1" role="dialog">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-xl" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title mr-auto">Help</h5>
+                <h5 class="modal-title mr-auto">Help (full documentation is available <a class="external" href="https://github.com/zadam/trilium/wiki">online</a>)</h5>
 
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
-                Hello!
+                <h4>Note navigation</h4>
+
+                <ul>
+                    <li><code>UP</code>, <code>DOWN</code> - go up/down in the list of notes, <code>CTRL-SHIFT-UP</code> and <code>CTRL-SHIFT-DOWN</code> work also from editor</li>
+                    <li><code>LEFT</code>, <code>RIGHT</code> - collapse/expand node</li>
+                    <li><code>ALT+LEFT</code>, <code>ALT+RIGHT</code> - go back / forwards in the history</li>
+                    <li><code>CTRL+J</code> - show [["Jump to" dialog|Note navigation#jump-to-note]]</li>
+                    <li><code>CTRL+.</code> - scroll to current note (useful when you scroll away from your note or your focus is currently in the editor)</li>
+                    <li><code>BACKSPACE</code> - jumps to parent note</li>
+                    <li><code>ALT+C</code> - collapse whole note tree</li>
+                    <li><code>ALT+-</code> (alt with minus sign) - collapse sub-tree (if some subtree takes too much space on tree pane you can collapse it)</li>
+                </ul>
+
+                <p>See demo of some of these features in [[note navigation|Note navigation]].</p>
+
+                <h4>Creating notes</h4>
+
+                <ul>
+                    <li><code>CTRL+O</code> - creates new note after the current note</li>
+                    <li><code>CTRL+P</code> - creates new sub-note into current note</li>
+                    <li><code>F2</code> - edit [[prefix|Tree concepts#prefix]] of current note clone</li>
+                </ul>
+
+                <h4>Moving / cloning notes</h4>
+
+                <ul>
+                    <li><code>CTRL+UP</code>, <code>CTRL+DOWN</code> - move note up/down in the note list</li>
+                    <li><code>CTRL+LEFT</code> - move note up in the note tree</li>
+                    <li><code>CTRL+RIGHT</code> - move note down in the note tree</li>
+                    <li><code>SHIFT+UP</code>, <code>SHIFT+DOWN</code> - multi-select note above/below</li>
+                    <li><code>CTRL+A</code> - select all notes in the current level</li>
+                    <li><code>CTRL+click</code> - multi select note which you clicked on </li>
+                    <li><code>CTRL+C</code> - copies current note (or current selection) into clipboard (used for [[cloning|Cloning notes]])</li>
+                    <li><code>CTRL+X</code> - cuts current (or current selection) note into clipboard (used for moving notes)</li>
+                    <li><code>CTRL+V</code> - pastes note(s) as sub-note into current note (which is either move or clone depending on whether it was copied or cut into clipboard)</li>
+                    <li><code>DEL</code> - delete note / sub-tree</li>
+                </ul>
+
+                <h4>Editing notes</h4>
+
+                <ul>
+                    <li><code>ENTER</code> in tree pane switches from tree pane into note title. Enter from note title switches focus to text editor. <code>CTRL+.</code> switches back from editor to tree pane.</li>
+                    <li><code>CTRL+K</code> - create / edit [[external link|Links]]</li>
+                    <li><code>CTRL+L</code> - create [[internal (note) link|Links]]</li>
+                    <li><code>ALT+T</code> - inserts current date and time at caret position</li>
+                    <li><code>CTRL+.</code> - jump away from the editor to tree pane and scroll to current note</li>
+                </ul>
+
+                <h4>Runtime shortcuts</h4>
+
+                <p>These are hooked in Electron to be similar to native browser keyboard shortcuts.</p>
+
+                <ul>
+                    <li><code>F5</code>, <code>CTRL-R</code> - reloads trilium frontend</li>
+                    <li><code>CTRL+SHIFT+I</code> - show developer tools</li>
+                    <li><code>CTRL+F</code> - show search dialog</li>
+                </ul>
+
+                <h4>Other</h4>
+
+                <ul>
+                    <li><code>ALT+O</code> - show SQL console (use only if you know what you're doing)</li>
+                    <li><code>ALT+M</code> - distraction-free mode - display only note editor, everything else is hidden</li>
+                    <li><code>CTRL+S</code> - toggle [[search]] form in tree pane</li>
+                    <li><code>ALT+A</code> - show note [[attributes]] dialog</li>
+                </ul>
             </div>
         </div>
     </div>