From cdc92e87f5e0e81ce1daf83e0ab81f770e1022e6 Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Sun, 5 Oct 2025 12:07:52 +0200
Subject: [PATCH 1/2] fix

---
 src/dashboard/Data/Browser/Browser.react.js       | 2 ++
 src/dashboard/Data/Browser/BrowserFooter.react.js | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index 6e0e21abeb..c2dbb9c324 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -2528,6 +2528,8 @@ class Browser extends DashboardView {
                 this.setState({ limit });
                 this.updateOrdering(this.state.ordering);
               }}
+              hasSelectedRows={Object.keys(this.state.selection).length > 0}
+              selectedRowsMessage={SELECTED_ROWS_MESSAGE}
             />
           </>
         );
diff --git a/src/dashboard/Data/Browser/BrowserFooter.react.js b/src/dashboard/Data/Browser/BrowserFooter.react.js
index 04f69474d7..cf75462f23 100644
--- a/src/dashboard/Data/Browser/BrowserFooter.react.js
+++ b/src/dashboard/Data/Browser/BrowserFooter.react.js
@@ -19,6 +19,10 @@ class BrowserFooter extends React.Component {
   }
 
   handleLimitChange = event => {
+    // Check if there are selected rows
+    if (this.props.hasSelectedRows && !window.confirm(this.props.selectedRowsMessage)) {
+      return;
+    }
     const newLimit = parseInt(event.target.value, 10);
     this.props.setLimit(newLimit);
     this.props.setSkip(0);
@@ -27,6 +31,10 @@ class BrowserFooter extends React.Component {
 
   handlePageChange = newSkip => {
     if (newSkip >= 0 && newSkip < this.props.count) {
+      // Check if there are selected rows
+      if (this.props.hasSelectedRows && !window.confirm(this.props.selectedRowsMessage)) {
+        return;
+      }
       this.props.setSkip(newSkip);
       this.setState({ pageInput: (Math.floor(newSkip / this.props.limit) + 1).toString() });
     }

From adabfc9640c194c5a22a2ec45d65136a8a9caa26 Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Sun, 5 Oct 2025 12:11:21 +0200
Subject: [PATCH 2/2] fix

---
 src/dashboard/Data/Browser/Browser.react.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/dashboard/Data/Browser/Browser.react.js b/src/dashboard/Data/Browser/Browser.react.js
index c2dbb9c324..ca760536d5 100644
--- a/src/dashboard/Data/Browser/Browser.react.js
+++ b/src/dashboard/Data/Browser/Browser.react.js
@@ -1246,6 +1246,13 @@ class Browser extends DashboardView {
   }
 
   updateFilters(filters) {
+    // Check if there are selected rows
+    if (Object.keys(this.state.selection).length > 0) {
+      if (!window.confirm(SELECTED_ROWS_MESSAGE)) {
+        return;
+      }
+    }
+
     const relation = this.state.relation;
     if (relation) {
       this.setRelation(relation, filters);