diff --git a/css/style.css b/css/style.css
index 32819ef69..c597b6826 100644
--- a/css/style.css
+++ b/css/style.css
@@ -189,9 +189,6 @@ a[href="javascript:;"] {
   text-decoration: none;
   padding: 1px;
 }
-#shortcuts:empty {
-  display: none;
-}
 .shortcut:not(:last-child)::after {
   content: " / ";
 }
diff --git a/html/General/Header.html b/html/General/Header.html
index 9251d7ff3..2e0088f42 100644
--- a/html/General/Header.html
+++ b/html/General/Header.html
@@ -1,9 +1,4 @@
 <div id="header-bar" class="dialog">
-  <span class="menu-button brackets-wrap">
-    <a href="javascript:;">
-      <i></i>
-    </a>
-  </span>
   <span id="shortcuts" class="brackets-wrap"></span>
   <span id="board-list">
     <span id="custom-board-list"></span>
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 47588d98c..efbc288fc 100644
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -10,7 +10,12 @@ Header =
     @toggle = $ '#toggle-header-bar', @bar
 
     @menu = new UI.Menu 'header'
-    $.on $('.menu-button', @bar), 'click', @menuToggle
+    menuButton = $.el 'a',
+      className: 'menu-button'
+      innerHTML: '<i></i>'
+      href: 'javascript:;'
+    $.on menuButton, 'click', @menuToggle
+    @addShortcut menuButton, 0
     $.on @toggle, 'mousedown', @toggleBarVisibility
     $.on window, 'load hashchange', Header.hashScroll
     $.on d, 'CreateNotification', @createNotification
@@ -247,11 +252,15 @@ Header =
       top -= headRect.top + headRect.height
     window.scrollBy 0, top
 
-  addShortcut: (el) ->
+  addShortcut: (el, index) ->
     shortcut = $.el 'span',
       className: 'shortcut'
     $.add shortcut, el
-    $.prepend $('#shortcuts', Header.bar), shortcut
+    shortcuts = $ '#shortcuts', Header.bar
+    nodes = [shortcuts.childNodes...]
+    nodes.splice index, 0, shortcut
+    $.add shortcuts, nodes
+
 
   menuToggle: (e) ->
     Header.menu.toggle e, @, g
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 6a3a06f20..cf28bef59 100644
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -8,7 +8,7 @@ ImageExpand =
       title: 'Expand All Images'
       href: 'javascript:;'
     $.on @EAI, 'click', ImageExpand.cb.toggleAll
-    Header.addShortcut @EAI
+    Header.addShortcut @EAI, 2
 
     Post::callbacks.push
       name: 'Image Expansion'
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 791802066..7c6d0afdf 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -27,7 +27,7 @@ QR =
       $.event 'CloseMenu'
       QR.open()
       QR.nodes.com.focus()
-    Header.addShortcut sc
+    Header.addShortcut sc, 1
 
     $.on d, 'QRGetSelectedPost', ({detail: cb}) ->
       cb QR.selected