diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index aebf005db33..8003db0a715 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -315,6 +315,7 @@ export class DashboardPage extends PureComponent<Props, State> {
             autoHeightMin="100%"
             setScrollTop={this.setScrollTop}
             scrollTop={updateScrollTop}
+            hideHorizontalTrack={true}
             updateAfterMountMs={500}
             className="custom-scrollbar--page"
           >
diff --git a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
index 8683fedcd51..37c2165a06a 100644
--- a/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
+++ b/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
@@ -111,6 +111,7 @@ exports[`DashboardPage Dashboard init completed  Should render dashboard grid 1`
       autoHideDuration={200}
       autoHideTimeout={200}
       className="custom-scrollbar--page"
+      hideHorizontalTrack={true}
       hideTracksWhenNotNeeded={false}
       setScrollTop={[Function]}
       updateAfterMountMs={500}
@@ -470,6 +471,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti
       autoHideDuration={200}
       autoHideTimeout={200}
       className="custom-scrollbar--page"
+      hideHorizontalTrack={true}
       hideTracksWhenNotNeeded={false}
       setScrollTop={[Function]}
       updateAfterMountMs={500}
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 9f781fd924c..63f86625bf9 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -17,8 +17,8 @@
 }
 
 .dashboard-content {
-  padding: $dashboard-padding $dashboard-padding 0 $dashboard-padding;
-  height: 100%;
+  padding: $dashboard-padding;
+  flex-grow: 1;
 }
 
 div.flot-text {