diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
index ad8b4ed3d8e..0eb1c68ab71 100644
--- a/public/app/core/components/scroll/scroll.ts
+++ b/public/app/core/components/scroll/scroll.ts
@@ -27,14 +27,17 @@ export function geminiScrollbar() {
       $(scrollBarHTML).appendTo(scrollRoot);
       elem.addClass(scrollerClass);
 
-      let scrollbar = baron({
+      let scrollParams = {
         root: scrollRoot[0],
         scroller: scroller[0],
         bar: '.baron__bar',
         barOnCls: '_scrollbar',
         scrollingCls: '_scrolling',
         track: '.baron__track',
-      });
+        direction: 'v',
+      };
+
+      let scrollbar = baron(scrollParams);
 
       let lastPos = 0;
 
@@ -57,6 +60,11 @@ export function geminiScrollbar() {
         scope
       );
 
+      appEvents.on('toggle-sidemenu', evt => {
+        // force updating dashboard width
+        scrollbar.scroll();
+      });
+
       scope.$on('$routeChangeSuccess', () => {
         lastPos = 0;
         elem[0].scrollTop = 0;
diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss
index 776c85d96b5..7fb8ac6608c 100644
--- a/public/sass/components/_scrollbar.scss
+++ b/public/sass/components/_scrollbar.scss
@@ -196,13 +196,8 @@
 }
 
 // Fix for side menu on mobile devices
-.sidemenu-open.sidemenu-open--xs {
-  .main-view.baron {
-    min-width: 0%;
-  }
-}
 .main-view.baron {
-  min-width: 99%;
+  min-width: unset;
 }
 
 .baron__clipper {