diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index 8003db0a715..f7bd7a0c62f 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -145,6 +145,7 @@ export class DashboardPage extends PureComponent<Props, State> {
         this.setState({
           viewPanel: panel,
           rememberScrollTop: this.state.scrollTop,
+          updateScrollTop: 0,
         });
       });
     }
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 63f86625bf9..46751b2c735 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -18,6 +18,7 @@
 
 .dashboard-content {
   padding: $dashboard-padding;
+  flex-basis: 100%;
   flex-grow: 1;
 }