diff --git a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
index d69155363..e7e0199c0 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/file-workload/file-workload.component.ts
@@ -310,7 +310,11 @@ export class FileWorkloadComponent extends AutoUnsubscribe implements OnInit, On
     @Debounce()
     scrollToSelectedAnnotation(): void {
         const annotationsElement = untracked(this._annotationsElement);
-        if (this.listingService.selected.length === 0 || !annotationsElement) {
+        if (
+            this.listingService.selected.length === 0 ||
+            !annotationsElement ||
+            this.activeAnnotations().length === this.listingService.selected.length
+        ) {
             return;
         }
         const elements: HTMLElement[] = annotationsElement.nativeElement.querySelectorAll(
diff --git a/libs/common-ui b/libs/common-ui
index 72e760fff..cbdfcf4d8 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 72e760fff8bc1adb72969b1e6e6971cdb88d55fe
+Subproject commit cbdfcf4d8fb3a63417b61604496d8fa81bdea671