diff --git a/src/components/ha-sidebar.html b/src/components/ha-sidebar.html
index 3bfb587aa5..83e04513e6 100644
--- a/src/components/ha-sidebar.html
+++ b/src/components/ha-sidebar.html
@@ -74,6 +74,11 @@
           <iron-icon item-icon icon='apps'></iron-icon> States
         </paper-icon-item>
 
+        <paper-icon-item on-click='menuClicked' data-panel='map'>
+          <iron-icon item-icon icon='maps:person-pin'></iron-icon>
+          Map
+        </paper-icon-item>
+
         <template is='dom-if' if='[[hasHistoryComponent]]'>
           <paper-icon-item on-click='menuClicked' data-panel='history'>
             <iron-icon item-icon icon='assessment'></iron-icon>
@@ -88,11 +93,6 @@
           </paper-icon-item>
         </template>
 
-        <paper-icon-item on-click='menuClicked' data-panel='map'>
-          <iron-icon item-icon icon='maps:person-pin'></iron-icon>
-          Map
-        </paper-icon-item>
-
         <paper-icon-item on-click='menuClicked' data-panel='logout' class='logout'>
           <iron-icon item-icon icon='exit-to-app'></iron-icon>
           Log Out