diff --git a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
index d905dcd24..cf3f51184 100644
--- a/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml
@@ -170,7 +170,7 @@
 
         <main class="flex-grow-1 py-4">
             <div class="container">
-                <partial name="_StatusMessage"/>
+                @await Html.PartialAsync("_StatusMessage", new ViewDataDictionary(ViewData){ { "Margin", "mb-4" } })
                 <div class="row">
                     <div class="col col-12 col-lg-6 mb-4">
                         <div class="jumbotron h-100 m-0 p-sm-5">
diff --git a/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml b/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml
index 3b0e0305a..a7b0f9f52 100644
--- a/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml
+++ b/BTCPayServer/Views/PullPayment/ViewPullPayment.cshtml
@@ -61,10 +61,10 @@
 
         <main class="flex-grow-1 py-4">
             <div class="container">
-                <partial name="_StatusMessage" />
+                @await Html.PartialAsync("_StatusMessage", new ViewDataDictionary(ViewData){ { "Margin", "mb-4" } })
                 @if (!ViewContext.ModelState.IsValid)
                 {
-                    @Html.ValidationSummary(string.Empty, new { @class = "alert alert-danger pb-0 text-center" })
+                    @Html.ValidationSummary(string.Empty, new { @class = "alert alert-danger mb-4 pb-0 text-center" })
                 }
                 <div class="row">
                     <div class="col col-12 col-lg-6 mb-4">
diff --git a/BTCPayServer/Views/Shared/_StatusMessage.cshtml b/BTCPayServer/Views/Shared/_StatusMessage.cshtml
index 7a01606f6..45674dc38 100644
--- a/BTCPayServer/Views/Shared/_StatusMessage.cshtml
+++ b/BTCPayServer/Views/Shared/_StatusMessage.cshtml
@@ -4,7 +4,7 @@
 
 @if (parsedModel != null)
 {
-    <div class="alert alert-@parsedModel.SeverityCSS @(parsedModel.AllowDismiss? "alert-dismissible":"" ) mb-5 text-break" role="alert">
+    <div class="alert alert-@parsedModel.SeverityCSS @(parsedModel.AllowDismiss? "alert-dismissible":"" ) @(ViewData["Margin"] ?? "mb-5") text-break" role="alert">
         @if (parsedModel.AllowDismiss)
         {
             <button type="button" class="close only-for-js" data-dismiss="alert" aria-label="Close">