diff --git a/public/app/core/components/scroll/page_scroll.ts b/public/app/core/components/scroll/page_scroll.ts
index 4782ad6d060..e6db344a4d6 100644
--- a/public/app/core/components/scroll/page_scroll.ts
+++ b/public/app/core/components/scroll/page_scroll.ts
@@ -29,7 +29,11 @@ export function pageScrollbar() {
       scope.$on('$routeChangeSuccess', () => {
         lastPos = 0;
         elem[0].scrollTop = 0;
+        elem[0].focus();
       });
+
+      elem[0].tabIndex = -1;
+      elem[0].focus();
     },
   };
 }
diff --git a/public/views/index.template.html b/public/views/index.template.html
index 9f151527b88..79da1d7179c 100644
--- a/public/views/index.template.html
+++ b/public/views/index.template.html
@@ -40,7 +40,7 @@
     </div>
 
     <div class="main-view">
-      <div class="scroll-canvas">
+      <div class="scroll-canvas" page-scrollbar>
         <div ng-view></div>
 
         <footer class="footer">