diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
index 981901ba0..13948d94a 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
@@ -140,6 +140,12 @@ export class FilePreviewScreenComponent
                 this.fullScreen = false;
             }
         });
+
+        this.pdf.instance.UI.hotkeys.on('command+f, ctrl+f', e => {
+            e.preventDefault();
+            this.pdf.focusSearch();
+            this.pdf.activateSearch();
+        });
     }
 
     get changed() {
@@ -360,7 +366,6 @@ export class FilePreviewScreenComponent
             this.closeFullScreen();
             this.pdf.deactivateSearch();
             this._changeRef.markForCheck();
-            window.focus();
         }
 
         if (['f', 'F'].includes($event.key)) {
@@ -368,12 +373,6 @@ export class FilePreviewScreenComponent
             if ($event.target instanceof HTMLInputElement || $event.target instanceof HTMLTextAreaElement) {
                 return;
             }
-            if ($event.ctrlKey) {
-                this.pdf.focusSearch();
-                this.pdf.activateSearch();
-                return;
-            }
-
             this.toggleFullScreen();
             return;
         }
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts
index cca642fef..6bdb2a5d1 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/document-viewer.service.ts
@@ -67,13 +67,7 @@ export class REDDocumentViewer {
                 }
                 return ($event.target as HTMLElement)?.tagName?.toLowerCase() !== 'input';
             }),
-            filter(
-                $event =>
-                    $event.key.startsWith('Arrow') ||
-                    $event.key === 'f' ||
-                    ['h', 'H'].includes($event.key) ||
-                    ['Escape'].includes($event.key),
-            ),
+            filter($event => $event.key.startsWith('Arrow') || ['f', 'h', 'H', 'Escape'].includes($event.key)),
             tap<KeyboardEvent>(stopAndPrevent),
             log('[PDF] Keyboard shortcut'),
         );
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts b/apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts
index 51396e3c6..e40fd8b43 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/utils/constants.ts
@@ -68,6 +68,7 @@ export const DISABLED_HOTKEYS = [
     'CTRL+P',
     'COMMAND+P',
     'CTRL+F',
+    'COMMAND+F',
     'SPACE',
     'UP',
     'DOWN',