diff --git a/EnvelopeGenerator.ReceiverUI/Pages/ReportViewer.razor b/EnvelopeGenerator.ReceiverUI/Pages/ReportViewer.razor
index b7a3a415..809ef757 100644
--- a/EnvelopeGenerator.ReceiverUI/Pages/ReportViewer.razor
+++ b/EnvelopeGenerator.ReceiverUI/Pages/ReportViewer.razor
@@ -17,6 +17,9 @@
 <link href="_content/DevExpress.Blazor.Themes/blazing-berry.bs5.min.css" rel="stylesheet" />
 <link href="_content/DevExpress.Blazor.Reporting.Viewer/css/dx-blazor-reporting-components.bs5.css" rel="stylesheet" />
 
+<div class="receiver-page-layout">
+
+<div class="receiver-signature-panel">
 <div class="card m-3">
     <div class="card-body">
         <h5 class="card-title">Unterschrift</h5>
@@ -38,6 +41,7 @@
         </div>
     </div>
 </div>
+</div>
 
 <DxPopup @bind-Visible="SignaturePopupVisible"
          HeaderText="Unterschrift erfassen"
@@ -114,9 +118,13 @@
     </FooterContentTemplate>
 </DxPopup>
 
+<div class="receiver-viewer-wrapper">
 @if(Report is not null) {
     <DxReportViewer @key="ViewerKey" @ref="reportViewer" Report="Report" RootCssClasses="w-100 h-100" />
 }
+</div>
+
+</div>
 
 @code {
     const string SignatureTabDraw = "draw";
diff --git a/EnvelopeGenerator.ReceiverUI/Shared/MainLayout.razor b/EnvelopeGenerator.ReceiverUI/Shared/MainLayout.razor
index 5cdff87e..c14b9ff2 100644
--- a/EnvelopeGenerator.ReceiverUI/Shared/MainLayout.razor
+++ b/EnvelopeGenerator.ReceiverUI/Shared/MainLayout.razor
@@ -7,7 +7,7 @@
             <a href="https://docs.microsoft.com/aspnet/" target="_blank">About</a>
         </div>
 
-        <article class="content px-4">
+        <article class="content">
             @Body
         </article>
     </main>
diff --git a/EnvelopeGenerator.ReceiverUI/wwwroot/css/app.css b/EnvelopeGenerator.ReceiverUI/wwwroot/css/app.css
index d3c8a997..aecfc78b 100644
--- a/EnvelopeGenerator.ReceiverUI/wwwroot/css/app.css
+++ b/EnvelopeGenerator.ReceiverUI/wwwroot/css/app.css
@@ -12,6 +12,28 @@ html, body {
 
 article {
     height: calc(100vh - 70px);
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+}
+
+.receiver-page-layout {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+}
+
+.receiver-signature-panel {
+    flex: 0 0 auto;
+}
+
+.receiver-viewer-wrapper {
+    flex: 1 1 0;
+    min-height: 0;
+    overflow: hidden;
 }
 
 .valid.modified:not([type=checkbox]) {