diff --git a/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml b/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
index ab68f75c9..d28f9b339 100644
--- a/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
+++ b/BTCPayServer/Views/UIInvoice/Checkout-Cheating.cshtml
@@ -1,10 +1,10 @@
 @model PaymentModel
 
-<main id="checkout-cheating" class="shadow-lg" v-cloak>
+<main id="checkout-cheating" class="shadow-lg" v-cloak v-if="display">
     <section>
         <p id="CheatSuccessMessage" class="alert alert-success text-break" v-if="successMessage" v-text="successMessage"></p>
         <p id="CheatErrorMessage" class="alert alert-danger text-break" v-if="errorMessage" v-text="errorMessage"></p>
-        <form id="test-payment" :action="`/i/${invoiceId}/test-payment`" method="post" v-on:submit.prevent="handleFormSubmit($event, 'paying')" v-if="!isPaid">
+        <form id="test-payment" :action="`/i/${invoiceId}/test-payment`" method="post" v-on:submit.prevent="handleFormSubmit($event, 'paying')" v-if="displayPayment">
             <input name="CryptoCode" type="hidden" value="@Model.CryptoCode">
             <input name="PaymentMethodId" type="hidden" :value="paymentMethodId">
             <label for="FakePayAmount" class="control-label form-label">Fake a @Model.CryptoCode payment for testing</label>
@@ -16,7 +16,7 @@
                 <button class="btn btn-secondary flex-shrink-0 px-3 w-100px" type="submit" :disabled="paying" id="FakePay">Pay</button>
             </div>
         </form>
-        <form id="mine-block" :action="`/i/${invoiceId}/mine-blocks`" method="post" class="mt-4" v-on:submit.prevent="handleFormSubmit($event, 'mining')" v-if="paymentMethodId === 'BTC'">
+        <form id="mine-block" :action="`/i/${invoiceId}/mine-blocks`" method="post" class="mt-4" v-on:submit.prevent="handleFormSubmit($event, 'mining')" v-if="displayMine">
             <label for="BlockCount" class="control-label form-label">Mine to test processing and settlement</label>
             <div class="d-flex gap-2">
                 <div class="input-group">
@@ -26,7 +26,7 @@
                 <button class="btn btn-secondary flex-shrink-0 px-3 w-100px" type="submit" :disabled="mining" id="Mine">Mine</button>
             </div>
         </form>
-        <form id="expire-invoice" :action="`/i/${invoiceId}/expire`" method="post" class="mt-4" v-on:submit.prevent="handleFormSubmit($event, 'expiring')" v-if="!isPaid">
+        <form id="expire-invoice" :action="`/i/${invoiceId}/expire`" method="post" class="mt-4" v-on:submit.prevent="handleFormSubmit($event, 'expiring')" v-if="displayExpire">
             <label for="ExpirySeconds" class="control-label form-label">Expire invoice in …</label>
             <div class="d-flex gap-2">
                 <div class="input-group">
@@ -58,6 +58,20 @@
             btcDue: Number,
             isPaid: Boolean
         },
+        computed: {
+            display() {
+                return this.successMessage || this.errorMessage || this.displayPayment || this.displayMine || this.displayExpire;
+            },
+            displayPayment () {
+                return !this.isPaid;
+            },
+            displayExpire () {
+                return !this.isPaid;
+            },
+            displayMine () {
+                return this.paymentMethodId === 'BTC';
+            }
+        },
         methods: {
             async handleFormSubmit (e, processing) {
                 const form = e.target;
diff --git a/BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml b/BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml
index bb9599d65..6acc4366d 100644
--- a/BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml
+++ b/BTCPayServer/Views/UIInvoice/CheckoutV2.cshtml
@@ -121,7 +121,7 @@
                             <vc:icon symbol="payment-complete"/>
                         </span>
                         <h4 v-t="'invoice_paid'"></h4>
-                        <dl class="mb-3">
+                        <dl class="mb-0">
                             <div>
                                 <dt v-t="'invoice_id'"></dt>
                                 <dd v-text="srvModel.invoiceId"></dd>