From 179ba7faa9f441372143c357f2c96e9b809305b4 Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 24 Jul 2025 15:24:43 +0200
Subject: [PATCH] Update DataBrowser.react.js

---
 src/dashboard/Data/Browser/DataBrowser.react.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/dashboard/Data/Browser/DataBrowser.react.js b/src/dashboard/Data/Browser/DataBrowser.react.js
index 1d0dbb7d1f..6b628f6d00 100644
--- a/src/dashboard/Data/Browser/DataBrowser.react.js
+++ b/src/dashboard/Data/Browser/DataBrowser.react.js
@@ -21,6 +21,7 @@ import AggregationPanel from '../../../components/AggregationPanel/AggregationPa
 
 const BROWSER_SHOW_ROW_NUMBER = 'browserShowRowNumber';
 const AGGREGATION_PANEL_VISIBLE = 'aggregationPanelVisible';
+const BROWSER_SCROLL_TO_TOP = 'browserScrollToTop';
 
 function formatValueForCopy(value, type) {
   if (value === undefined) {
@@ -83,6 +84,8 @@ export default class DataBrowser extends React.Component {
       window.localStorage?.getItem(BROWSER_SHOW_ROW_NUMBER) === 'true';
     const storedPanelVisible =
       window.localStorage?.getItem(AGGREGATION_PANEL_VISIBLE) === 'true';
+    const storedScrollToTop =
+      window.localStorage?.getItem(BROWSER_SCROLL_TO_TOP) !== 'false';
     const hasAggregation =
       props.classwiseCloudFunctions?.[
         `${props.app.applicationId}${props.appName}`
@@ -107,7 +110,7 @@ export default class DataBrowser extends React.Component {
       showAggregatedData: true,
       frozenColumnIndex: -1,
       showRowNumber: storedRowNumber,
-      scrollToTop: true,
+      scrollToTop: storedScrollToTop,
       prefetchCache: {},
       selectionHistory: [],
     };
@@ -669,7 +672,11 @@ export default class DataBrowser extends React.Component {
   }
 
   toggleScrollToTop() {
-    this.setState(prevState => ({ scrollToTop: !prevState.scrollToTop }));
+    this.setState(prevState => {
+      const newScrollToTop = !prevState.scrollToTop;
+      window.localStorage?.setItem(BROWSER_SCROLL_TO_TOP, newScrollToTop);
+      return { scrollToTop: newScrollToTop };
+    });
   }
 
   getPrefetchSettings() {