diff --git a/frontend-html/src/gui/Components/DataViewHeader/DataViewHeaderButton.tsx b/frontend-html/src/gui/Components/DataViewHeader/DataViewHeaderButton.tsx
index d1301f31dc..e0c21ba569 100644
--- a/frontend-html/src/gui/Components/DataViewHeader/DataViewHeaderButton.tsx
+++ b/frontend-html/src/gui/Components/DataViewHeader/DataViewHeaderButton.tsx
@@ -26,9 +26,11 @@ export const DataViewHeaderButton: React.FC<{
   isHidden?: boolean;
   disabled?: boolean;
   title?: string;
+  id?: string;
   onClick?(event: any): void;
 }> = (props) => (
   <button
+    id={props.id}
     title={props.title}
     ref={props.domRef}
     className={cx(props.disabled ? S.disabled : S.enabled, S.root, {hidden: props.isHidden})}
diff --git a/frontend-html/src/gui/Components/DataViewHeader/DataViewHeaderButtonGroup.tsx b/frontend-html/src/gui/Components/DataViewHeader/DataViewHeaderButtonGroup.tsx
index 1fa61bc61f..096133f59c 100644
--- a/frontend-html/src/gui/Components/DataViewHeader/DataViewHeaderButtonGroup.tsx
+++ b/frontend-html/src/gui/Components/DataViewHeader/DataViewHeaderButtonGroup.tsx
@@ -51,6 +51,7 @@ export class DataViewHeaderButtonGroup extends React.Component<{
             <Observer key={action.id}>
               {() => (
                 <DataViewHeaderButton
+                  id={action.id}
                   title={action.caption}
                   disabled={!getIsEnabledAction(action)}
                   onClick={() => setDropped(true)}
@@ -85,6 +86,7 @@ export class DataViewHeaderButtonGroup extends React.Component<{
       <Observer key={action.id}>
         {() => (
           <DataViewHeaderButton
+            id={action.id}
             title={action.caption}
             onClick={(event) => uiActions.actions.onActionClick(action)(event, action)}
             disabled={!getIsEnabledAction(action)}
diff --git a/frontend-html/src/model/entities/DataView.ts b/frontend-html/src/model/entities/DataView.ts
index e54b779562..05f45a6445 100644
--- a/frontend-html/src/model/entities/DataView.ts
+++ b/frontend-html/src/model/entities/DataView.ts
@@ -297,6 +297,18 @@ export class DataView implements IDataView {
     this.selectAllCheckboxChecked = false;
   }
 
+  updateSelectedIds() {
+    const currentRowIds = this.dataTable.rows
+      .map(row => this.dataTable.getRowId(row));
+    for (let rowId of Array.from(this.selectedRowIds)) {
+      if (!currentRowIds.includes(rowId)) {
+        this.selectedRowIds.delete(rowId);
+      }
+    }
+    this.selectAllCheckboxChecked = currentRowIds.length > 0
+      && currentRowIds.every(rowId => this.selectedRowIds.has(rowId));
+  }
+
   @action.bound
   clear() {
     this.selectedRowIds.clear();
diff --git a/frontend-html/src/model/entities/ListRowContainer.ts b/frontend-html/src/model/entities/ListRowContainer.ts
index 6b6185e94c..3ec394b5d1 100644
--- a/frontend-html/src/model/entities/ListRowContainer.ts
+++ b/frontend-html/src/model/entities/ListRowContainer.ts
@@ -132,6 +132,7 @@ export class ListRowContainer implements IRowsContainer {
         }
         self.sortedIds = rows.map(row => self.rowIdGetter(row));
         const dataView = getDataView(self);
+        dataView.updateSelectedIds();
         if (!data?.retainPreviousSelection) {
           dataView.reselectOrSelectFirst();
         }
diff --git a/frontend-html/src/model/entities/types/IDataView.ts b/frontend-html/src/model/entities/types/IDataView.ts
index e35094a45b..596fad1250 100644
--- a/frontend-html/src/model/entities/types/IDataView.ts
+++ b/frontend-html/src/model/entities/types/IDataView.ts
@@ -202,6 +202,8 @@ export interface IDataView extends IDataViewData {
   exportToExcel(): void;
 
   isLazyLoading: Boolean;
+
+  updateSelectedIds(): void;
 }
 
 export const isIDataView = (o: any): o is IDataView => o?.$type_IDataView;