diff --git a/BTCPayServer/Views/Invoice/Invoice.cshtml b/BTCPayServer/Views/Invoice/Invoice.cshtml
index d663678ac..831cbf37a 100644
--- a/BTCPayServer/Views/Invoice/Invoice.cshtml
+++ b/BTCPayServer/Views/Invoice/Invoice.cshtml
@@ -11,16 +11,6 @@
         text-decoration: line-through;
     }
 
-    .smMaxWidth {
-        max-width: 200px;
-    }
-
-    @@media (min-width: 768px) {
-        .smMaxWidth {
-            max-width: 400px;
-        }
-    }
-
     .firstCol {
         width: 140px;
     }
diff --git a/BTCPayServer/Views/Invoice/InvoicePaymentsPartial.cshtml b/BTCPayServer/Views/Invoice/InvoicePaymentsPartial.cshtml
index 6ba393f12..d5ffe97d4 100644
--- a/BTCPayServer/Views/Invoice/InvoicePaymentsPartial.cshtml
+++ b/BTCPayServer/Views/Invoice/InvoicePaymentsPartial.cshtml
@@ -57,10 +57,12 @@
                         <tr @replaced>
                             <td>@payment.Crypto</td>
                             <td>@payment.DepositAddress</td>
-                            <td class="smMaxWidth text-truncate">
-                                <a href="@payment.TransactionLink" target="_blank">
-                                    @payment.TransactionId
-                                </a>
+                            <td>
+                                <div class="wraptextAuto">
+                                    <a href="@payment.TransactionLink" target="_blank">
+                                        @payment.TransactionId
+                                    </a>
+                                </div>
                             </td>
                             <td class="text-right">@payment.Confirmations</td>
                         </tr>
@@ -87,7 +89,7 @@
                     {
                         <tr>
                             <td>@payment.Crypto</td>
-                            <td class="smMaxWidth text-truncate">@payment.BOLT11</td>
+                            <td><div class="wraptextAuto">@payment.BOLT11</div></td>
                         </tr>
                     }
                 </tbody>
diff --git a/BTCPayServer/wwwroot/main/css/site.css b/BTCPayServer/wwwroot/main/css/site.css
index f25aa4be7..e88a643cd 100644
--- a/BTCPayServer/wwwroot/main/css/site.css
+++ b/BTCPayServer/wwwroot/main/css/site.css
@@ -22,4 +22,17 @@
 
 .display-when-ledger-connected{
     display: none;
+
+.wraptextAuto {
+    max-width: 300px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: block;
+    white-space: nowrap;
+}
+
+@media (min-width: 768px) {
+    .wraptextAuto {
+        max-width: 600px;
+    }
 }