diff --git a/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html b/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html
index fc2290d9bf..5e0dfd9a50 100644
--- a/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html
+++ b/dashboard-ui/bower_components/paper-drawer-panel/paper-drawer-panel.html
@@ -586,8 +586,8 @@ Custom property | Description | Default
             this.notifyResize();
           }
           if (e.propertyName === 'transform' && this.selected === 'drawer') {
-            var focusedChild = this._getAutoFocusedNode();
-            focusedChild && focusedChild.focus();
+            //var focusedChild = this._getAutoFocusedNode();
+            //focusedChild && focusedChild.focus();
           }
         },
 
@@ -827,7 +827,7 @@ Custom property | Description | Default
             focusedChildCameFromDrawer = path.shift() === drawerContent;
           }
           if (!focusedChildCameFromDrawer && autoFocusedNode) {
-            autoFocusedNode.focus();
+            //autoFocusedNode.focus();
           }
         },