diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index 31b6f5b8096..70a1bda3e8b 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -83,6 +83,10 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
         body.toggleClass('sidemenu-hidden');
       });
 
+      scope.$watch(() => playlistSrv.isPlaying, function(newValue) {
+        elem.toggleClass('playlist-active', newValue === true);
+      });
+
       // tooltip removal fix
       // manage page classes
       var pageClass;
diff --git a/public/app/core/directives/dash_class.js b/public/app/core/directives/dash_class.js
index 9df53bdbd48..4a139272632 100644
--- a/public/app/core/directives/dash_class.js
+++ b/public/app/core/directives/dash_class.js
@@ -18,10 +18,6 @@ function (_, $, coreModule) {
           elem.toggleClass('panel-in-fullscreen', false);
         });
 
-        $scope.$watch('ctrl.playlistSrv.isPlaying', function(newValue) {
-          elem.toggleClass('playlist-active', newValue === true);
-        });
-
         $scope.$watch('ctrl.dashboardViewState.state.editview', function(newValue) {
           if (newValue) {
             elem.toggleClass('dashboard-page--settings-opening', _.isString(newValue));
diff --git a/public/sass/components/_view_states.scss b/public/sass/components/_view_states.scss
index 45fa3a631ee..be5361ceeb4 100644
--- a/public/sass/components/_view_states.scss
+++ b/public/sass/components/_view_states.scss
@@ -1,5 +1,6 @@
 .page-kiosk-mode {
-  dashnav {
+  .sidemenu,
+  .navbar {
     display: none;
   }
 }
@@ -31,6 +32,10 @@
     }
   }
 
+  .sidemenu {
+    display: none;
+  }
+
   .gf-timepicker-nav-btn {
     transform: translate3d(40px, 0, 0);
   }