diff --git a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
index b974ea885..fff5ade47 100644
--- a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml
@@ -256,11 +256,9 @@
                     </div>
                 </div>
                 <div class="success-message">{{$t("This invoice has been paid")}}</div>
-                <button class="action-button">
-                    <bp-done-text>
-                        <span>{{$t("Return to StoreName", srvModel)}}</span>
-                    </bp-done-text>
-                </button>
+                <a class="action-button" :href="srvModel.merchantRefLink" v-show="srvModel.merchantRefLink">
+                    <span>{{$t("Return to StoreName", srvModel)}}</span>
+                </a>
             </div>
         </div>
         <div class="button-wrapper refund-address-form-container" id="refund-overpayment-button">
@@ -302,10 +300,9 @@
                     {{srvModel.orderId}}
                 </div>
             </div>
-            <a class="action-button" style="margin-top: 20px;">
-                <bp-done-text>
-                    <span>{{$t("Return to StoreName", srvModel)}}</span>
-                </bp-done-text>
+            <a class="action-button" :href="srvModel.merchantRefLink" v-show="srvModel.merchantRefLink"
+               style="margin-top: 20px;">
+                <span>{{$t("Return to StoreName", srvModel)}}</span>
             </a>
         </div>
     </div>
diff --git a/BTCPayServer/wwwroot/checkout/js/core.js b/BTCPayServer/wwwroot/checkout/js/core.js
index 35628b944..39c2af6cb 100644
--- a/BTCPayServer/wwwroot/checkout/js/core.js
+++ b/BTCPayServer/wwwroot/checkout/js/core.js
@@ -32,15 +32,6 @@ function onDataCallback(jsonData) {
             $(".modal-dialog").removeClass("expired");
         }
 
-        if (srvModel.merchantRefLink !== "") {
-            $(".action-button").click(function () {
-                window.location.href = srvModel.merchantRefLink;
-            });
-        }
-        else {
-            $(".action-button").hide();
-        }
-
         $(".modal-dialog").addClass("paid");
 
         resetTabsSlider();