diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.html
index 2f4bf19dc..563f7d03f 100644
--- a/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.html
+++ b/apps/red-ui/src/app/modules/file-preview/dialogs/structured-component-management-dialog/structured-component-management-dialog.component.html
@@ -21,7 +21,7 @@
                         [parentId]="getValueCellId(index)"
                         [saveTooltip]="'rss-dialog.actions.save' | translate"
                         [value]="entry.value.value ?? entry.value.originalValue"
-                        [helpModeKey]="'scm_edit_DIALOG'"
+                        [attr.helpModeKey]="'scm_edit_DIALOG'"
                     >
                         <ng-container slot="editing">
                             <iqser-circle-button
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 cf56904e0..5e1619616 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
@@ -399,7 +399,7 @@ export class FilePreviewScreenComponent
             this._changeRef.markForCheck();
         }
 
-        if (['f', 'F'].includes($event.key)) {
+        if (['f', 'F'].includes($event.key) && !$event.ctrlKey) {
             // if you type in an input, don't toggle full-screen
             if ($event.target instanceof HTMLInputElement || $event.target instanceof HTMLTextAreaElement) {
                 return;
diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
index 0c4cbb236..c892bec91 100644
--- a/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
+++ b/apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
@@ -105,8 +105,10 @@ export class PdfViewer {
     focusSearch() {
         const iframeWindow = this.#instance.UI.iframeWindow;
         const input = iframeWindow.document.getElementById('SearchPanel__input') as HTMLInputElement;
-        input.focus();
-        input.select();
+        if (input) {
+            input.focus();
+            input.select();
+        }
     }
 
     activateSearch() {
@@ -258,8 +260,8 @@ export class PdfViewer {
     #listenForCommandF() {
         this.#instance.UI.hotkeys.on('command+f, ctrl+f', e => {
             e.preventDefault();
-            this.focusSearch();
             this.activateSearch();
+            this.focusSearch();
         });
     }
 
@@ -288,7 +290,9 @@ export class PdfViewer {
 
             const inputElement = iframeWindow.document.getElementById('SearchPanel__input') as HTMLInputElement;
 
-            setTimeout(() => (inputElement.value = ''), 0);
+            if (inputElement) {
+                setTimeout(() => (inputElement.value = ''), 0);
+            }
 
             if (!event.detail.isVisible) {
                 this.documentViewer.clearSearchResults();
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 06321a60a..3d69a1dbb 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
@@ -80,6 +80,7 @@ export const DISABLED_HOTKEYS = [
     'C',
     'E',
     'I',
+    'F',
     'L',
     'N',
     'O',
diff --git a/libs/common-ui b/libs/common-ui
index 6cb63fcf4..8d4a68f92 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 6cb63fcf43fbbf522b847f57467156808bbe72a1
+Subproject commit 8d4a68f92cc74c54382ff898c39fab0cd8e0f72c