diff --git a/js/impress.js b/js/impress.js
index cf0d8ffbd..6a08b7681 100644
--- a/js/impress.js
+++ b/js/impress.js
@@ -1836,11 +1836,6 @@
 /**
  * Help popup plugin
  *
- * Example:
- *
- *     <!-- Show a help popup at start, or if user presses "H" -->
- *     <div id="impress-help"></div>
- *
  * For developers:
  *
  * Typical use for this plugin, is for plugins that support some keypress, to add a line
@@ -1856,38 +1851,77 @@
     var rows = [];
     var timeoutHandle;
 
-    var triggerEvent = function( el, eventName, detail ) {
-        var event = document.createEvent( "CustomEvent" );
-        event.initCustomEvent( eventName, true, true, detail );
-        el.dispatchEvent( event );
+    var body = document.querySelector( "body" );
+
+    // This querySelector is used to keep compatibility with templates using div#impress-help
+    var helpDiv = document.querySelector( "#impress-help" ) || document.createElement( "div" );
+    body.appendChild( helpDiv );
+
+    var fullHelpDiv = document.createElement( "div" );
+    var fullHelpStyle = {
+        display: "none",
+        position: "fixed",
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0,
+        backgroundColor: "#000",
+        color: "#FFF",
+        opacity: 0.8,
+        textAlign: "center",
+        padding: "3em"
     };
 
-    var renderHelpDiv = function() {
-        var helpDiv = document.getElementById( "impress-help" );
-        if ( helpDiv ) {
+    body.appendChild( fullHelpDiv );
+
+    var css = function( elem, style ) {
+        for ( var p in style ) {
+            elem.style[ p ] = style[ p ];
+        }
+    };
+    css( fullHelpDiv, fullHelpStyle );
+
+    var renderDiv = function( elem, shortOnly ) {
+        if ( elem ) {
             var html = [];
             for ( var row in rows ) {
                 for ( var arrayItem in row ) {
-                    html.push( rows[ row ][ arrayItem ] );
+                    var item = rows[ row ][ arrayItem ];
+                    if ( item ) {
+                        if ( ( shortOnly && item.short ) || !shortOnly ) {
+                            html.push( item.row );
+                        }
+                    }
                 }
             }
             if ( html ) {
-                helpDiv.innerHTML = "<table>\n" + html.join( "\n" ) + "</table>\n";
+                elem.innerHTML = "<table style='width: 100%'>\n" + html.join( "\n" ) + "</table>\n";
             }
         }
     };
 
-    var toggleHelp = function() {
-        var helpDiv = document.getElementById( "impress-help" );
-        if ( !helpDiv ) {
+    var renderHelpDiv = function() {
+        renderDiv( helpDiv, true );
+        renderDiv( fullHelpDiv, false );
+    };
+
+    var toggle = function( elem ) {
+        if ( !elem ) {
             return;
         }
 
-        if ( helpDiv.style.display === "block" ) {
-            helpDiv.style.display = "none";
+        if ( elem.style.display === "block" ) {
+            elem.style.display = "none";
         } else {
-            helpDiv.style.display = "block";
-            window.clearTimeout( timeoutHandle );
+            elem.style.display = "block";
+            if ( elem === helpDiv ) {
+                window.clearTimeout( timeoutHandle );
+            } else {
+
+                // Hides helpDiv when fullHelpDiv is shown
+                helpDiv.style.display = "none";
+                window.clearTimeout( timeoutHandle );
+            }
         }
     };
 
@@ -1895,7 +1929,10 @@
 
         if ( event.keyCode === 72 || event.keyCode === 191 ) { // "h" || "?"
             event.preventDefault();
-            toggleHelp();
+            toggle( helpDiv );
+        } else if ( event.key === "F1" ) {
+            event.preventDefault();
+            toggle( fullHelpDiv );
         }
     }, false );
 
@@ -1907,6 +1944,7 @@
      * :param: e.detail.command  Example: "H"
      * :param: e.detail.text     Example: "Show this help."
      * :param: e.detail.row      Row index from 0 to 9 where to place this help text. Example: 0
+     * :param: e.detail.short    If this help must appear in the short help. Example: true
      */
     document.addEventListener( "impress:help:add", function( e ) {
 
@@ -1915,39 +1953,44 @@
         // its own array. If there are more than one entry for the same index, they are shown in
         // first come, first serve ordering.
         var rowIndex = e.detail.row;
-        if ( typeof rows[ rowIndex ] !== "object" || !rows[ rowIndex ].isArray ) {
-            rows[ rowIndex ] = [];
-        }
-        rows[ e.detail.row ].push( "<tr><td><strong>" + e.detail.command + "</strong></td><td>" +
-                                   e.detail.text + "</td></tr>" );
+        var short = e.detail.short;
+        rows[ rowIndex ] = rows[ rowIndex ] || [];
+        rows[ e.detail.row ].push( {
+            row: "<tr><td><strong>" + e.detail.command + "</strong></td><td>" +
+                                   e.detail.text + "</td></tr>",
+            short: !!short
+        } );
         renderHelpDiv();
     } );
 
     document.addEventListener( "impress:init", function( e ) {
+        var api = e.detail.api;
+        var gc = api.lib.gc;
+        var util = api.lib.util;
+
         renderHelpDiv();
 
         // At start, show the help for 7 seconds.
-        var helpDiv = document.getElementById( "impress-help" );
         if ( helpDiv ) {
             helpDiv.style.display = "block";
             timeoutHandle = window.setTimeout( function() {
-                var helpDiv = document.getElementById( "impress-help" );
                 helpDiv.style.display = "none";
             }, 7000 );
 
             // Regster callback to empty the help div on teardown
-            var api = e.detail.api;
-            api.lib.gc.pushCallback( function() {
+            gc.pushCallback( function() {
                 window.clearTimeout( timeoutHandle );
-                helpDiv.style.display = "";
-                helpDiv.innerHTML = "";
+                helpDiv.remove();
+                fullHelpDiv.remove();
                 rows = [];
             } );
         }
 
         // Use our own API to register the help text for "h"
-        triggerEvent( document, "impress:help:add",
-                      { command: "H", text: "Show this help", row: 0 } );
+        util.triggerEvent( document, "impress:help:add",
+                      { command: "H", text: "Show/hide this help", row: 0, short: true } );
+        util.triggerEvent( document, "impress:help:add",
+                      { command: "F1", text: "Show/hide full help", row: 999, short: true } );
     } );
 
 } )( document, window );
@@ -2555,7 +2598,7 @@
 
         // Add 'P' to the help popup
         triggerEvent( document, 'impress:help:add',
-                        { command: 'P', text: 'Presenter console', row: 10 } );
+                        { command: 'P', text: 'Presenter console', row: 10, short: true } );
     } );
 
     // Returns a string to be used inline as a css <style> element in the console window.
@@ -3297,7 +3340,8 @@
         // Add a line to the help popup
         util.triggerEvent( document, "impress:help:add", { command: "Left &amp; Right",
                                                            text: "Previous &amp; Next step",
-                                                           row: 1 } );
+                                                           row: 1,
+                                                           short: true } );
 
     }, false );
 
diff --git a/src/plugins/help/help.js b/src/plugins/help/help.js
index a3db15e0f..88f7a0e48 100644
--- a/src/plugins/help/help.js
+++ b/src/plugins/help/help.js
@@ -1,11 +1,6 @@
 /**
  * Help popup plugin
  *
- * Example:
- *
- *     <!-- Show a help popup at start, or if user presses "H" -->
- *     <div id="impress-help"></div>
- *
  * For developers:
  *
  * Typical use for this plugin, is for plugins that support some keypress, to add a line
@@ -21,38 +16,77 @@
     var rows = [];
     var timeoutHandle;
 
-    var triggerEvent = function( el, eventName, detail ) {
-        var event = document.createEvent( "CustomEvent" );
-        event.initCustomEvent( eventName, true, true, detail );
-        el.dispatchEvent( event );
+    var body = document.querySelector( "body" );
+
+    // This querySelector is used to keep compatibility with templates using div#impress-help
+    var helpDiv = document.querySelector( "#impress-help" ) || document.createElement( "div" );
+    body.appendChild( helpDiv );
+
+    var fullHelpDiv = document.createElement( "div" );
+    var fullHelpStyle = {
+        display: "none",
+        position: "fixed",
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0,
+        backgroundColor: "#000",
+        color: "#FFF",
+        opacity: 0.8,
+        textAlign: "center",
+        padding: "3em"
     };
 
-    var renderHelpDiv = function() {
-        var helpDiv = document.getElementById( "impress-help" );
-        if ( helpDiv ) {
+    body.appendChild( fullHelpDiv );
+
+    var css = function( elem, style ) {
+        for ( var p in style ) {
+            elem.style[ p ] = style[ p ];
+        }
+    };
+    css( fullHelpDiv, fullHelpStyle );
+
+    var renderDiv = function( elem, shortOnly ) {
+        if ( elem ) {
             var html = [];
             for ( var row in rows ) {
                 for ( var arrayItem in row ) {
-                    html.push( rows[ row ][ arrayItem ] );
+                    var item = rows[ row ][ arrayItem ];
+                    if ( item ) {
+                        if ( ( shortOnly && item.short ) || !shortOnly ) {
+                            html.push( item.row );
+                        }
+                    }
                 }
             }
             if ( html ) {
-                helpDiv.innerHTML = "<table>\n" + html.join( "\n" ) + "</table>\n";
+                elem.innerHTML = "<table style='width: 100%'>\n" + html.join( "\n" ) + "</table>\n";
             }
         }
     };
 
-    var toggleHelp = function() {
-        var helpDiv = document.getElementById( "impress-help" );
-        if ( !helpDiv ) {
+    var renderHelpDiv = function() {
+        renderDiv( helpDiv, true );
+        renderDiv( fullHelpDiv, false );
+    };
+
+    var toggle = function( elem ) {
+        if ( !elem ) {
             return;
         }
 
-        if ( helpDiv.style.display === "block" ) {
-            helpDiv.style.display = "none";
+        if ( elem.style.display === "block" ) {
+            elem.style.display = "none";
         } else {
-            helpDiv.style.display = "block";
-            window.clearTimeout( timeoutHandle );
+            elem.style.display = "block";
+            if ( elem === helpDiv ) {
+                window.clearTimeout( timeoutHandle );
+            } else {
+
+                // Hides helpDiv when fullHelpDiv is shown
+                helpDiv.style.display = "none";
+                window.clearTimeout( timeoutHandle );
+            }
         }
     };
 
@@ -60,7 +94,10 @@
 
         if ( event.keyCode === 72 || event.keyCode === 191 ) { // "h" || "?"
             event.preventDefault();
-            toggleHelp();
+            toggle( helpDiv );
+        } else if ( event.key === "F1" ) {
+            event.preventDefault();
+            toggle( fullHelpDiv );
         }
     }, false );
 
@@ -72,6 +109,7 @@
      * :param: e.detail.command  Example: "H"
      * :param: e.detail.text     Example: "Show this help."
      * :param: e.detail.row      Row index from 0 to 9 where to place this help text. Example: 0
+     * :param: e.detail.short    If this help must appear in the short help. Example: true
      */
     document.addEventListener( "impress:help:add", function( e ) {
 
@@ -80,39 +118,44 @@
         // its own array. If there are more than one entry for the same index, they are shown in
         // first come, first serve ordering.
         var rowIndex = e.detail.row;
-        if ( typeof rows[ rowIndex ] !== "object" || !rows[ rowIndex ].isArray ) {
-            rows[ rowIndex ] = [];
-        }
-        rows[ e.detail.row ].push( "<tr><td><strong>" + e.detail.command + "</strong></td><td>" +
-                                   e.detail.text + "</td></tr>" );
+        var short = e.detail.short;
+        rows[ rowIndex ] = rows[ rowIndex ] || [];
+        rows[ e.detail.row ].push( {
+            row: "<tr><td><strong>" + e.detail.command + "</strong></td><td>" +
+                                   e.detail.text + "</td></tr>",
+            short: !!short
+        } );
         renderHelpDiv();
     } );
 
     document.addEventListener( "impress:init", function( e ) {
+        var api = e.detail.api;
+        var gc = api.lib.gc;
+        var util = api.lib.util;
+
         renderHelpDiv();
 
         // At start, show the help for 7 seconds.
-        var helpDiv = document.getElementById( "impress-help" );
         if ( helpDiv ) {
             helpDiv.style.display = "block";
             timeoutHandle = window.setTimeout( function() {
-                var helpDiv = document.getElementById( "impress-help" );
                 helpDiv.style.display = "none";
             }, 7000 );
 
             // Regster callback to empty the help div on teardown
-            var api = e.detail.api;
-            api.lib.gc.pushCallback( function() {
+            gc.pushCallback( function() {
                 window.clearTimeout( timeoutHandle );
-                helpDiv.style.display = "";
-                helpDiv.innerHTML = "";
+                helpDiv.remove();
+                fullHelpDiv.remove();
                 rows = [];
             } );
         }
 
         // Use our own API to register the help text for "h"
-        triggerEvent( document, "impress:help:add",
-                      { command: "H", text: "Show this help", row: 0 } );
+        util.triggerEvent( document, "impress:help:add",
+                      { command: "H", text: "Show/hide this help", row: 0, short: true } );
+        util.triggerEvent( document, "impress:help:add",
+                      { command: "F1", text: "Show/hide full help", row: 999, short: true } );
     } );
 
 } )( document, window );
diff --git a/src/plugins/impressConsole/impressConsole.js b/src/plugins/impressConsole/impressConsole.js
index bfabea581..533b43ddd 100644
--- a/src/plugins/impressConsole/impressConsole.js
+++ b/src/plugins/impressConsole/impressConsole.js
@@ -600,7 +600,7 @@
 
         // Add 'P' to the help popup
         triggerEvent( document, 'impress:help:add',
-                        { command: 'P', text: 'Presenter console', row: 10 } );
+                        { command: 'P', text: 'Presenter console', row: 10, short: true } );
     } );
 
     // Returns a string to be used inline as a css <style> element in the console window.
diff --git a/src/plugins/navigation/navigation.js b/src/plugins/navigation/navigation.js
index d5b1d1302..d895255b4 100644
--- a/src/plugins/navigation/navigation.js
+++ b/src/plugins/navigation/navigation.js
@@ -182,7 +182,8 @@
         // Add a line to the help popup
         util.triggerEvent( document, "impress:help:add", { command: "Left &amp; Right",
                                                            text: "Previous &amp; Next step",
-                                                           row: 1 } );
+                                                           row: 1,
+                                                           short: true } );
 
     }, false );