diff --git a/public/app/features/explore/Explore.tsx b/public/app/features/explore/Explore.tsx
index 0e5592355e8..2720d06d2c6 100644
--- a/public/app/features/explore/Explore.tsx
+++ b/public/app/features/explore/Explore.tsx
@@ -509,14 +509,13 @@ export class Explore extends React.PureComponent<Props, ExploreState> {
 
     return (
       <>
-        <ExploreToolbar exploreId={exploreId} onChangeTime={this.onChangeTime} topOfViewRef={this.topOfViewRef} />
+        <ExploreToolbar exploreId={exploreId} onChangeTime={this.onChangeTime} />
         <CustomScrollbar
           testId={selectors.pages.Explore.General.scrollView}
-          autoHeightMin={'100%'}
           scrollRefCallback={(scrollElement) => (this.scrollElement = scrollElement || undefined)}
         >
           {datasourceInstance ? (
-            <div className={styles.exploreContainer}>
+            <div className={styles.exploreContainer} ref={this.topOfViewRef}>
               <PanelContainer className={styles.queryContainer}>
                 {correlationsBox}
                 <QueryRows exploreId={exploreId} />
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index ecce29a88a8..84f0fc35bbb 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -54,7 +54,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
 interface Props {
   exploreId: string;
   onChangeTime: (range: RawTimeRange, changedByScanner?: boolean) => void;
-  topOfViewRef: RefObject<HTMLDivElement>;
+  topOfViewRef?: RefObject<HTMLDivElement>;
 }
 
 export function ExploreToolbar({ exploreId, topOfViewRef, onChangeTime }: Props) {