diff --git a/public/app/core/components/grafana_app.ts b/public/app/core/components/grafana_app.ts
index 798a40cb1bf..1e3f0cb9119 100644
--- a/public/app/core/components/grafana_app.ts
+++ b/public/app/core/components/grafana_app.ts
@@ -167,6 +167,7 @@ export function grafanaAppDirective(playlistSrv, contextSrv, $timeout, $rootScop
           if (sidemenuHidden) {
             sidemenuHidden = false;
             body.addClass('sidemenu-open');
+            appEvents.emit('toggle-inactive-mode');
             $timeout(function() {
               $rootScope.$broadcast('render');
             }, 100);
diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
index 0eb1c68ab71..ebe105a4fee 100644
--- a/public/app/core/components/scroll/scroll.ts
+++ b/public/app/core/components/scroll/scroll.ts
@@ -60,10 +60,16 @@ export function geminiScrollbar() {
         scope
       );
 
-      appEvents.on('toggle-sidemenu', evt => {
-        // force updating dashboard width
+      // force updating dashboard width
+      appEvents.on('toggle-sidemenu', forceUpdate);
+      appEvents.on('toggle-sidemenu-hidden', forceUpdate);
+      appEvents.on('toggle-view-mode', forceUpdate);
+      appEvents.on('toggle-kiosk-mode', forceUpdate);
+      appEvents.on('toggle-inactive-mode', forceUpdate);
+
+      function forceUpdate() {
         scrollbar.scroll();
-      });
+      }
 
       scope.$on('$routeChangeSuccess', () => {
         lastPos = 0;