diff --git a/src/public/javascripts/services/entrypoints.js b/src/public/javascripts/services/entrypoints.js
index 30a663dfb..e63e98bc5 100644
--- a/src/public/javascripts/services/entrypoints.js
+++ b/src/public/javascripts/services/entrypoints.js
@@ -143,7 +143,7 @@ function registerEntrypoints() {
     }
 
     if (utils.isElectron()) {
-        utils.bindShortcut('f11', () => {
+        const toggleFullscreen = function() {
             const win = require('electron').remote.getCurrentWindow();
 
             if (win.isFullScreenable()) {
@@ -151,7 +151,15 @@ function registerEntrypoints() {
             }
 
             return false;
-        });
+        };
+
+        $("#toggle-fullscreen-button").click(toggleFullscreen);
+
+        utils.bindShortcut('f11', toggleFullscreen);
+    }
+    else {
+        // outside of electron this is handled by the browser
+        $("#toggle-fullscreen-button").hide();
     }
 
     // FIXME: do we really need these at this point?
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index 239d6633c..1442140b3 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -80,6 +80,12 @@
                         <kbd>CTRL-R</kbd>
                     </a>
 
+                    <a class="dropdown-item" id="toggle-fullscreen-button">
+                        <span class="jam jam-empty"></span>
+                        Toggle fullscreen
+                        <kbd>F11</kbd>
+                    </a>
+
                     <a class="dropdown-item" id="show-help-button">
                         <span class="jam jam-help"></span>
                         Show Help