diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
index 41e420e28..072e77354 100644
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@@ -1,6 +1,15 @@
 ﻿@model InvoicesModel
 @{
     ViewData["Title"] = "Invoices";
+    var rootUrl = Context.Request.GetAbsoluteRoot();
+}
+
+@section HeadScripts {
+    <script src="~/modal/btcpay.js"></script>
+    <script type="text/javascript">
+        btcpay.setApiUrlPrefix("@rootUrl");
+    </script>
+
 }
 
 <section>
@@ -107,8 +116,13 @@
                             <td style="text-align:right">
                                 @if (invoice.ShowCheckout)
                                 {
-                                    <a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> <span>-</span>
-                                }<a asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId">Details</a>
+                                    <span>
+                                        <a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a>
+                                        <a href="javascript:btcpay.showInvoice('@invoice.InvoiceId')">[^]</a>
+                                        -
+                                    </span>
+                                }
+                                <a asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId">Details</a>
                             </td>
                         </tr>
                     }
diff --git a/BTCPayServer/wwwroot/modal/btcpay.js b/BTCPayServer/wwwroot/modal/btcpay.js
index 8ea852d89..557b7c80d 100644
--- a/BTCPayServer/wwwroot/modal/btcpay.js
+++ b/BTCPayServer/wwwroot/modal/btcpay.js
@@ -22,7 +22,7 @@
     iframe.style.left = 0;
     iframe.style.height = '100%';
     iframe.style.width = '100%';
-    iframe.style.zIndex = '1000';
+    iframe.style.zIndex = '2000';
 
     var origin = 'http://slack.btcpayserver.org join us there, and initialize this with your origin url through setApiUrlPrefix';
     // urlPrefix should be site root without trailing slash
diff --git a/BTCPayServer/wwwroot/modal/test.html b/BTCPayServer/wwwroot/modal/test.html
deleted file mode 100644
index 43b2a6248..000000000
--- a/BTCPayServer/wwwroot/modal/test.html
+++ /dev/null
@@ -1,11 +0,0 @@
-﻿<html>
-<head>
-    <script src="btcpay.js"></script>
-    <script type="text/javascript">
-        btcpay.setApiUrlPrefix("http://127.0.0.1:14142");
-    </script>
-</head>
-<body>
-    <button onclick="btcpay.showInvoice('25DKDgcB4z4PtkPJyHVYnV')">Open Modal</button>
-</body>
-</html>
