diff --git a/homeassistant/components/frontend/www_static/polymer/layouts/home-assistant-main.html b/homeassistant/components/frontend/www_static/polymer/layouts/home-assistant-main.html
index 055f6f0938c..dfb47acf672 100644
--- a/homeassistant/components/frontend/www_static/polymer/layouts/home-assistant-main.html
+++ b/homeassistant/components/frontend/www_static/polymer/layouts/home-assistant-main.html
@@ -271,6 +271,7 @@
 
     listeners: {
       'menu.core-select': 'menuSelect',
+      'open-menu': 'openDrawer',
     },
 
     stateStoreChanged: function(stateStore) {
@@ -314,6 +315,10 @@
       }
     },
 
+    openDrawer: function() {
+      this.$.drawer.openDrawer();
+    },
+
     closeDrawer: function() {
       this.$.drawer.closeDrawer();
     },
diff --git a/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html b/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html
index 2f92eb237af..7b25c31eecb 100644
--- a/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html
+++ b/homeassistant/components/frontend/www_static/polymer/layouts/partial-base.html
@@ -9,7 +9,7 @@
   <template>
     <paper-scroll-header-panel class='fit'>
       <paper-toolbar>
-        <paper-icon-button icon='menu' paper-drawer-toggle></paper-icon-button>
+        <paper-icon-button icon='menu' hidden$='[[!narrow]]' on-click='toggleMenu'></paper-icon-button>
         <div class='flex'>
           <content select='[header-title]'></content>
         </div>
@@ -32,6 +32,10 @@
         value: false,
       },
     },
+
+    toggleMenu: function() {
+      this.fire('open-menu');
+    },
   });
 })();
 </script>