diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html
index 4610330d1..77d368eb3 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html
@@ -1,7 +1,6 @@
 <div
     (mousedown)="fileAttributesService.resetEdit()"
     [class.help-mode-active]="helpModeService?.isHelpModeActive$ | async"
-    [class.active-entity]="activeEntity()"
     class="workflow-item"
 >
     <div class="details-wrapper">
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss
index cedc4054d..1c6ea4bc6 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.scss
@@ -12,7 +12,7 @@
     }
 
     &:hover,
-    &.active-entity,
+    &:has(iqser-circle-button[aria-expanded='true']),
     &.help-mode-active {
         redaction-file-actions {
             display: initial;
diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.ts b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.ts
index c8a1670ce..6f81ffc56 100644
--- a/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.ts
+++ b/apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.ts
@@ -12,7 +12,6 @@ import { FileWorkloadComponent } from '../table-item/file-workload/file-workload
 import { ProcessingIndicatorComponent } from '@shared/components/processing-indicator/processing-indicator.component';
 import { FileActionsComponent } from '../../../shared-dossiers/components/file-actions/file-actions.component';
 import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
-import { ActiveListingEntityService } from '@common-ui/listing/services/active-listing-entity.service';
 
 @Component({
     selector: 'redaction-workflow-item',
@@ -39,14 +38,12 @@ export class WorkflowItemComponent implements OnInit {
     @ViewChild('actionsWrapper', { static: true }) private _actionsWrapper: ElementRef;
     width: number;
     readonly trackBy = trackByFactory();
-    readonly activeEntity = computed(() => this._activeListingEntityService.activeEntity() === this.file?.id);
     @Input({ required: true }) file: File;
     @Input({ required: true }) dossier: Dossier;
     @Input({ required: true }) displayedAttributes: IFileAttributeConfig[];
 
     constructor(
         readonly fileAttributesService: FileAttributesService,
-        readonly _activeListingEntityService: ActiveListingEntityService,
         private readonly _changeRef: ChangeDetectorRef,
         @Optional() readonly helpModeService: HelpModeService,
     ) {}
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
index eb345e747..9659eeb5d 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.html
@@ -1,6 +1,6 @@
 @if (dropdownButton()) {
     <iqser-circle-button
-        (click)="setActiveListingEntity($event)"
+        (click)="$event.stopImmediatePropagation()"
         [matMenuTriggerFor]="downloadMenu"
         [tooltipClass]="tooltipClass()"
         [tooltipPosition]="tooltipPosition()"
@@ -24,7 +24,7 @@
     ></iqser-circle-button>
 }
 
-<mat-menu #downloadMenu="matMenu" (closed)="onDownloadMenuClosed()">
+<mat-menu #downloadMenu="matMenu">
     <button (click)="downloadComponentAsJSON($event)" [innerHTML]="'component-download.json' | translate" mat-menu-item></button>
     <button (click)="downloadComponentAsXML($event)" [innerHTML]="'component-download.xml' | translate" mat-menu-item></button>
     <button (click)="downloadFiles($event)" [innerHTML]="'component-download.report' | translate" mat-menu-item></button>
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
index 74749f353..83b6089e4 100644
--- a/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/buttons/file-download-btn/file-download-btn.component.ts
@@ -10,7 +10,6 @@ import { TranslateModule } from '@ngx-translate/core';
 import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
 import { firstValueFrom } from 'rxjs';
 import { ComponentLogService } from '@services/files/component-log.service';
-import { ActiveListingEntityService } from '@common-ui/listing/services/active-listing-entity.service';
 
 @Component({
     selector: 'redaction-file-download-btn',
@@ -40,7 +39,6 @@ export class FileDownloadBtnComponent implements OnChanges {
         private readonly _permissionsService: PermissionsService,
         private readonly _fileDownloadService: FileDownloadService,
         private readonly _componentLogService: ComponentLogService,
-        private readonly _activeListingEntity: ActiveListingEntityService,
         private readonly _dialog: IqserDialog,
         private readonly _toaster: Toaster,
     ) {}
@@ -85,18 +83,6 @@ export class FileDownloadBtnComponent implements OnChanges {
             .catch(() => this._toaster.error(_('download-status.error')));
     }
 
-    onDownloadMenuClosed() {
-        this._activeListingEntity.updateEntity();
-    }
-
-    setActiveListingEntity($event: MouseEvent) {
-        $event.stopImmediatePropagation();
-        if (this.dropdownButton()) {
-            const entityId = this.dossierDownload() ? this.dossier().id : this.files()[0].id;
-            this._activeListingEntity.updateEntity(entityId);
-        }
-    }
-
     downloadComponentAsJSON($event: MouseEvent) {
         $event.stopImmediatePropagation();
         this.menuTrigger?.closeMenu();
diff --git a/libs/common-ui b/libs/common-ui
index 7f8336a64..00b1b40a3 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 7f8336a64f3e3bed6e4751be3c0624a98b4aa727
+Subproject commit 00b1b40a3112dc168046ca3bc261dd8dbbc02538