diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss
index 75433a35b..965a39992 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss
@@ -83,7 +83,7 @@
                 cursor: pointer;
                 transition: background-color 0.25s;
 
-                &:hover {
+                &:not(.disabled):hover {
                     background-color: $grey-6;
                 }
 
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
index 78b726a8d..3dc825054 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
@@ -29,7 +29,6 @@ import { FormBuilder, FormGroup } from '@angular/forms';
 import { FileManagementControllerService, StatusControllerService } from '@redaction/red-ui-http';
 import { PdfViewerDataService } from '../service/pdf-viewer-data.service';
 import { download } from '../../../utils/file-download-utils';
-import { MatButtonToggleChange } from '@angular/material/button-toggle';
 import { ViewMode } from '../model/view-mode';
 
 const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape'];
@@ -81,10 +80,6 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
         return this._instance;
     }
 
-    get displayedPages(): number[] {
-        return Object.keys(this.displayedAnnotations).map((key) => Number(key));
-    }
-
     get activeViewerPage() {
         return this._instance?.docViewer?.getCurrentPage();
     }
@@ -120,7 +115,9 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
     public analysisInterval: number;
 
     public quickScrollFirstEnabled = false;
-    public quickScrollLastEnabled = true;
+    public quickScrollLastEnabled = false;
+
+    public displayedPages: number[] = [];
 
     get indeterminateMode() {
         return (
@@ -599,6 +596,7 @@ export class FilePreviewScreenComponent implements OnInit, OnDestroy {
 
     filtersChanged(filters: FilterModel[]) {
         this.displayedAnnotations = this._annotationProcessingService.filterAndGroupAnnotations(this.annotations, filters);
+        this.displayedPages = Object.keys(this.displayedAnnotations).map((key) => Number(key));
         this._changeDetectorRef.markForCheck();
     }