diff --git a/public/app/core/components/NativeScrollbar.tsx b/public/app/core/components/NativeScrollbar.tsx
index 9116f47b055..26d68c9e361 100644
--- a/public/app/core/components/NativeScrollbar.tsx
+++ b/public/app/core/components/NativeScrollbar.tsx
@@ -24,11 +24,11 @@ export default function NativeScrollbar({ children, onSetScrollRef, divId }: Pro
 
   useEffect(() => {
     if (config.featureToggles.bodyScrolling && onSetScrollRef) {
-      onSetScrollRef(new WindowScrollElement());
+      onSetScrollRef(new DivScrollElement(document.documentElement));
     }
 
     if (!config.featureToggles.bodyScrolling && ref.current && onSetScrollRef) {
-      onSetScrollRef(ref.current);
+      onSetScrollRef(new DivScrollElement(ref.current));
     }
   }, [ref, onSetScrollRef]);
 
@@ -42,13 +42,23 @@ export default function NativeScrollbar({ children, onSetScrollRef, divId }: Pro
   );
 }
 
-class WindowScrollElement {
+class DivScrollElement {
+  public constructor(private element: HTMLElement) {}
   public get scrollTop() {
-    return window.scrollY;
+    return this.element.scrollTop;
   }
 
-  public scrollTo(x: number, y: number) {
-    window.scrollTo(x, y);
+  public scrollTo(x: number, y: number, retry = 0) {
+    // If the element does not have the height we wait a few frames and look again
+    // Gives the view time to render and get the correct height before we restore scroll position
+    const canScroll = this.element.scrollHeight - this.element.clientHeight - y >= 0;
+
+    if (!canScroll && retry < 10) {
+      requestAnimationFrame(() => this.scrollTo(x, y, retry + 1));
+      return;
+    }
+
+    this.element.scrollTo(x, y);
   }
 }
 
diff --git a/public/app/features/dashboard-scene/scene/DashboardScene.tsx b/public/app/features/dashboard-scene/scene/DashboardScene.tsx
index 5274e75c459..13f1069c653 100644
--- a/public/app/features/dashboard-scene/scene/DashboardScene.tsx
+++ b/public/app/features/dashboard-scene/scene/DashboardScene.tsx
@@ -942,9 +942,7 @@ export class DashboardScene extends SceneObjectBase<DashboardSceneState> {
 
   public restoreScrollPos() {
     if (this._prevScrollPos !== undefined) {
-      setTimeout(() => {
-        this._scrollRef?.scrollTo(0, this._prevScrollPos!);
-      }, 50);
+      this._scrollRef?.scrollTo(0, this._prevScrollPos!);
     }
   }
 }