diff --git a/BTCPayServer/Views/Shared/Confirm.cshtml b/BTCPayServer/Views/Shared/Confirm.cshtml
index 6e90764ec..d4c472373 100644
--- a/BTCPayServer/Views/Shared/Confirm.cshtml
+++ b/BTCPayServer/Views/Shared/Confirm.cshtml
@@ -7,18 +7,19 @@
 
 @section PageHeadContent {
     <style>
-        body > .content-wrapper { display: flex; min-height: 100vh; }
+        body > .content-wrapper { flex-grow: 1; display:  flex; }
+        body > .content-wrapper, body > .content-wrapper > .container { flex-grow:1; }
         .modal-dialog .btn-close { display: none; }
     </style>
 }
 
 @section PageFootContent {
     <script>
-        document.getElementById('ConfirmCancel').addEventListener('click', function () {
+        delegate('click', '#ConfirmCancel', function () {
             history.back();
-            return false;
         })
     </script>
 }
-
-<partial name="ConfirmModal" model="Model" />
+<div class="modal position-static d-block" tabindex="-1">
+    <partial name="ConfirmModal" model="Model" />
+</div>
diff --git a/BTCPayServer/Views/Shared/_LayoutSimple.cshtml b/BTCPayServer/Views/Shared/_LayoutSimple.cshtml
index cfc72a214..8e30939bf 100644
--- a/BTCPayServer/Views/Shared/_LayoutSimple.cshtml
+++ b/BTCPayServer/Views/Shared/_LayoutSimple.cshtml
@@ -14,8 +14,6 @@
 </head>
 <body class="d-flex flex-column min-vh-100">
     <section class="content-wrapper flex-grow-1">
-        @*Dummy navbar-brand, hackish way to keep test AssertNoError passing*@
-        <div class="navbar-brand d-none"></div>
         <div class="container">
             @RenderBody()
         </div>
