diff --git a/material/base.html b/material/base.html
index 27f6430640fa4cec90f73e0b8adc8e3de1a3e2b3..e1e02a800f8f067aff0bddfc7c226502114f2c8f 100644
--- a/material/base.html
+++ b/material/base.html
@@ -91,8 +91,8 @@
         {% endif %}
       </defs>
     </svg>
-    <input class="md-toggle" data-md-toggle="drawer" type="checkbox" id="drawer">
-    <input class="md-toggle" data-md-toggle="search" type="checkbox" id="search">
+    <input class="md-toggle" data-md-toggle="drawer" type="checkbox" id="drawer" autocomplete="off">
+    <input class="md-toggle" data-md-toggle="search" type="checkbox" id="search" autocomplete="off">
     <label class="md-overlay" data-md-component="overlay" for="drawer"></label>
     {% if page.toc | first is defined %}
       <a href="{{ (page.toc | first).url }}" tabindex="1" class="md-skip">
diff --git a/src/base.html b/src/base.html
index 895863f038226ae6f3152b09eb78cc824d633079..bb9132ca726197a3103a57855c1d73a29197559f 100644
--- a/src/base.html
+++ b/src/base.html
@@ -180,11 +180,14 @@
       </defs>
     </svg>
 
-    <!-- State toggles -->
+    <!--
+      State toggles - we need to set autocomplete="off" in order to reset the
+      drawer on back button invocation in some browsers
+    -->
     <input class="md-toggle" data-md-toggle="drawer"
-        type="checkbox" id="drawer" />
+        type="checkbox" id="drawer" autocomplete="off" />
     <input class="md-toggle" data-md-toggle="search"
-        type="checkbox" id="search" />
+        type="checkbox" id="search" autocomplete="off" />
 
     <!-- Overlay for expanded drawer -->
     <label class="md-overlay" data-md-component="overlay" for="drawer"></label>