diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html
index 586d7883f..79ddc5e48 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html
@@ -6,9 +6,9 @@
   <button type="button" class="btn-close" (click)="activeModal.dismiss()" [disabled]="saving" aria-label="Close" i18n-aria-label></button>
 </div>
 
-<div class="modal-body">
-<div class="row" [attr.inert]="saving ? '' : null" [attr.aria-busy]="saving">
-  <div class="col-lg-4 mb-3">
+<div class="modal-body d-flex flex-column">
+<div class="row gx-3 editor-layout flex-grow-1 flex-lg-nowrap" [attr.inert]="saving ? '' : null" [attr.aria-busy]="saving">
+  <div class="col-lg-4 mb-3 mb-lg-0 overflow-auto">
     <ul ngbNav #nav="ngbNav" [(activeId)]="activeTab" class="nav-underline flex-nowrap flex-md-wrap overflow-auto">
         <li ngbNavItem="settings">
           <a ngbNavLink i18n>Template</a>
@@ -174,8 +174,8 @@
       <div [ngbNavOutlet]="nav" class="mt-3"></div>
     </div>
 
-    <div class="col-lg-8">
-      <div class="mb-2">
+    <div class="col-lg-8 d-flex flex-column">
+      <div class="mb-2 flex-shrink-0">
         <label class="visually-hidden" for="preview-document" i18n>Sample document</label>
         <div class="input-group input-group-sm">
           <span class="input-group-text">
@@ -222,8 +222,8 @@
           }
         </div>
       }
-      <div #previewContainer class="position-relative">
-        <div class="zone-preview-scroll overflow-auto border" [attr.aria-busy]="previewStatus === 'loading'">
+      <div #previewContainer class="position-relative flex-grow-1 overflow-hidden">
+        <div class="h-100 overflow-auto border" [attr.aria-busy]="previewStatus === 'loading'">
           @if (previewStatus === 'error') {
             <div class="py-5 px-3 text-center" role="alert">
               <i-bs name="exclamation-triangle" width="32" height="32" class="text-warning"></i-bs>
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.scss b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.scss
index a0c7efa42..f4822622b 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.scss
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.scss
@@ -4,8 +4,14 @@
   min-height: 0;
 }
 
-.zone-preview-scroll {
-  max-height: 78vh;
+@media (min-width: 992px) {
+  .modal-body {
+    overflow: hidden;
+  }
+
+  .editor-layout {
+    min-height: 0;
+  }
 }
 
 .preview-page-input {
diff --git a/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts b/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts
index bf7910b17..bc9934e0b 100644
--- a/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts
+++ b/src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts
@@ -83,7 +83,7 @@ export class OcrTemplatesComponent
     const modal = this.modalService.open(OcrTemplateEditorComponent, {
       backdrop: 'static',
       keyboard: false,
-      size: 'xl',
+      size: 'xxl',
       fullscreen: 'lg',
       scrollable: true,
       ariaLabelledBy: 'ocr-template-editor-title',
diff --git a/src-ui/src/styles.scss b/src-ui/src/styles.scss
index c135d343b..02e7a89ed 100644
--- a/src-ui/src/styles.scss
+++ b/src-ui/src/styles.scss
@@ -690,6 +690,12 @@ table.table {
   }
 }
 
+@media (min-width: 992px) {
+  .modal-xxl {
+    --bs-modal-width: min(1440px, calc(100vw - 2 * var(--bs-modal-margin)));
+  }
+}
+
 .toast {
   --bs-toast-max-width: var(--pngx-toast-max-width);
 }