diff --git a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
index edf9c834c..b50dca7c9 100644
--- a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
@@ -203,10 +203,10 @@
                     </div>
                 </div>
                 <div class="success-message">{{$t("This invoice has been paid")}}</div>
-                <a class="action-button" :href="srvModel.merchantRefLink" v-show="!srvModel.isModal">
+                <a class="action-button" :href="srvModel.merchantRefLink" v-show="!isModal">
                     <span v-html="$t('Return to StoreName', srvModel)"></span>
                 </a>
-                <button class="action-button close-action" v-show="srvModel.isModal" v-on:click="close">
+                <button class="action-button close-action" v-show="isModal" v-on:click="close">
                     <span v-html="$t('Close')">{{$t("Return to StoreName", srvModel)}}</span>
                 </button>
             </div>
@@ -236,10 +236,10 @@
                     {{srvModel.orderId}}
                 </div>
             </div>
-            <a class="action-button" :href="srvModel.merchantRefLink" v-show="!srvModel.isModal">
+            <a class="action-button" :href="srvModel.merchantRefLink" v-show="!isModal">
                 <span>{{$t("Return to StoreName", srvModel)}}</span>
             </a>
-            <button class="action-button close-action" v-show="srvModel.isModal" v-on:click="close">
+            <button class="action-button close-action" v-show="isModal" v-on:click="close">
                 <span>{{$t("Return to StoreName", srvModel)}}</span>
             </button>
         </div>
diff --git a/BTCPayServer/Views/Invoice/Checkout.cshtml b/BTCPayServer/Views/Invoice/Checkout.cshtml
index 4cc150396..5b32baa72 100644
--- a/BTCPayServer/Views/Invoice/Checkout.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout.cshtml
@@ -173,7 +173,8 @@
             emailAddressFormSubmitting: false,
             lineItemsExpanded: false,
             changingCurrencies: false,
-            loading: true
+            loading: true,
+            isModal: initialSrvModel.isModal
         },
         computed: {
             expiringSoon: function(){