          overflow-y: auto;
          overflow-x: hidden;
        }
-@@ -532,7 +532,7 @@
-     flex-shrink: 0;
-     overflow: hidden;
- 
--    .mdl-layout__container > & {
-+    .mdl-layout > .mdl-layout__inner-container > & {
-       position: absolute;
-       top: 0;
-       left: 0;
 diff --git a/src/layout/layout.js b/src/layout/layout.js
-index 229ceb8..85dbe0a 100644
+index b479f90..e30c4b1 100644
 --- a/src/layout/layout.js
 +++ b/src/layout/layout.js
 @@ -84,7 +84,7 @@

diff --git a/src/layout/_layout.scss b/src/layout/_layout.scss
index de8fc0c..4ca5645 100644
--- a/src/layout/_layout.scss
+++ b/src/layout/_layout.scss
@@ -39,14 +39,9 @@

         }
 
         if (mode === this.Mode_.STANDARD) {
@@ -368,20 +361,16 @@
 
       // Add drawer toggling button to our layout, if we have an openable drawer.
       if (this.drawer_) {
-        var drawerButton = this.element_.querySelector('.' +
-          this.CssClasses_.DRAWER_BTN);
-        if (!drawerButton) {
-          drawerButton = document.createElement('div');
-          drawerButton.setAttribute('aria-expanded', 'false');
-          drawerButton.setAttribute('role', 'button');
-          drawerButton.setAttribute('tabindex', '0');
-          drawerButton.classList.add(this.CssClasses_.DRAWER_BTN);
-
-          var drawerButtonIcon = document.createElement('i');
-          drawerButtonIcon.classList.add(this.CssClasses_.ICON);
-          drawerButtonIcon.innerHTML = this.Constant_.MENU_ICON;
-          drawerButton.appendChild(drawerButtonIcon);
-        }
+        var drawerButton = document.createElement('div');
+        drawerButton.setAttribute('aria-expanded', 'false');
+        drawerButton.setAttribute('role', 'button');
+        drawerButton.setAttribute('tabindex', '0');
+        drawerButton.classList.add(this.CssClasses_.DRAWER_BTN);
+
+        var drawerButtonIcon = document.createElement('i');
+        drawerButtonIcon.classList.add(this.CssClasses_.ICON);
+        drawerButtonIcon.innerHTML = this.Constant_.MENU_ICON;
+        drawerButton.appendChild(drawerButtonIcon);
 
         if (this.drawer_.classList.contains(this.CssClasses_.ON_LARGE_SCREEN)) {
           //If drawer has ON_LARGE_SCREEN class then add it to the drawer toggle button as well.
@@ -511,6 +500,13 @@
         }
       }
 
