diff --git a/public/app/core/components/scroll/scroll.ts b/public/app/core/components/scroll/scroll.ts
index 14647f9cf60..54c84e2df11 100644
--- a/public/app/core/components/scroll/scroll.ts
+++ b/public/app/core/components/scroll/scroll.ts
@@ -12,6 +12,10 @@ export function geminiScrollbar() {
         elem[0].scrollTop = 0;
       });
 
+      scope.$on('$routeUpdate', () => {
+        elem[0].scrollTop = 0;
+      });
+
       scope.$on('$destroy', () => {
         scrollbar.destroy();
       });