diff --git a/docs/examples/dashboard/example.js b/docs/examples/dashboard/example.js
index 22118fd5..1f291547 100644
--- a/docs/examples/dashboard/example.js
+++ b/docs/examples/dashboard/example.js
@@ -31,14 +31,14 @@ $(document).ready(function() { // document ready is a little convoluted because
 
     var $btn = $(this)
     var $icon = $btn.find('.material-icons')
-    if ($icon.text() == 'visibility_off') {
+    if ($icon.text() == 'visibility') {
       $container.addClass('mdb-drawer-out') // demo only, regardless of the responsive class, we want to force it close
-      $icon.text('visibility')
+      $icon.text('visibility_off')
       $btn.attr('title', 'Drawer allow responsive opening')
     }
     else {
       $container.removeClass('mdb-drawer-out') // demo only, regardless of the responsive class, we want to force it open
-      $icon.text('visibility_off')
+      $icon.text('visibility')
       $btn.attr('title', 'Drawer force closed')
     }
   })
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 1e5771e8..8b129188 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -32,7 +32,7 @@ js: example.js
         <ul class="nav navbar-nav pull-xs-right">
           <li class="nav-item">
             <button class="btn mdb-btn-icon" title="Drawer force close" id="drawer-visibility">
-              <i class="material-icons">visibility_off</i>
+              <i class="material-icons">visibility</i>
             </button>
           </li>
           <li class="nav-item">
diff --git a/js/src/drawer.js b/js/src/drawer.js
index dd404d88..80e7db4b 100644
--- a/js/src/drawer.js
+++ b/js/src/drawer.js
@@ -21,6 +21,7 @@ const Drawer = (($) => {
   const ClassName = {
     IN: 'in',
     DRAWER_IN: `mdb-drawer-in`,
+    DRAWER_OUT: `mdb-drawer-out`,
     DRAWER: 'mdb-layout-drawer',
     CONTAINER: 'mdb-layout-container'
   }
@@ -81,7 +82,7 @@ const Drawer = (($) => {
     }
 
     show() {
-      if (this._isOpen()) {
+      if (this._isForcedClosed() || this._isOpen()) {
         return
       }
 
@@ -121,6 +122,10 @@ const Drawer = (($) => {
       return this.$container.hasClass(ClassName.DRAWER_IN)
     }
 
+    _isForcedClosed() {
+      return this.$container.hasClass(ClassName.DRAWER_OUT)
+    }
+
     _addAria() {
       let isOpen = this._isOpen()
       this.$element.attr('aria-expanded', isOpen)