diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js
index 50697abb9..ab8b709cd 100644
--- a/src/public/javascripts/desktop.js
+++ b/src/public/javascripts/desktop.js
@@ -94,6 +94,13 @@ $(document).on("click", "button[data-help-page]", e => {
 
 $("#logout-button").toggle(!utils.isElectron());
 
+$("#logout-button").click(() => {
+    const $logoutForm = $('<form action="logout" method="POST">');
+
+    $("body").append($logoutForm);
+    $logoutForm.submit();
+});
+
 $("#tree").on("click", ".unhoist-button", hoistedNoteService.unhoist);
 
 if (utils.isElectron()) {
diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
index edd7506ad..3664f3976 100644
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@@ -44,20 +44,29 @@
         </div>
 
         <div>
-            <button class="btn btn-sm" id="sync-now-button" title="Trigger sync">
-                <span class="jam jam-refresh"></span>
-                Sync (<span id="outstanding-syncs-count">0</span>)
-            </button>
-
-            <button class="btn btn-sm" id="options-button">
-                <span class="jam jam-settings-alt"></span> Options</button>
-
-            <form action="logout" id="logout-button" method="POST" style="display: inline;">
-                <button type="submit" class="btn btn-sm">
-                    <span class="jam jam-log-out"></span>
-                    Logout
+            <div class="dropdown" id="global-menu">
+                <button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-sm dropdown-toggle">
+                    <span class="jam jam-align-justify"></span>
+                    Menu
+                    <span class="caret"></span>
                 </button>
-            </form>
+                <div class="dropdown-menu dropdown-menu-right">
+                    <a class="dropdown-item" id="options-button">
+                        <span class="jam jam-settings-alt"></span>
+                        Options
+                    </a>
+
+                    <a class="dropdown-item" id="sync-now-button" title="Trigger sync">
+                        <span class="jam jam-refresh"></span>
+                        Sync (<span id="outstanding-syncs-count">0</span>)
+                    </a>
+
+                    <a class="dropdown-item" id="logout-button">
+                        <span class="jam jam-log-out"></span>
+                        Logout
+                    </a>
+                </div>
+            </div>
         </div>
     </div>