diff --git a/BTCPayServer/Views/Stores/ListTokens.cshtml b/BTCPayServer/Views/Stores/ListTokens.cshtml
index 35355dfee..9274ac99c 100644
--- a/BTCPayServer/Views/Stores/ListTokens.cshtml
+++ b/BTCPayServer/Views/Stores/ListTokens.cshtml
@@ -7,9 +7,10 @@
 <partial name="_StatusMessage" />
 @if (Model.StoreNotConfigured)
 {
-    <div class="alert alert-warning alert-dismissible" role="alert">
+    <div class="alert alert-warning alert-dismissible mb-5" role="alert">
         <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <span>Warning: No wallet has been linked to your BTCPay Store. See <a href="https://docs.btcpayserver.org/WalletSetup/" target="_blank" class="alert-link">this link</a> for more information on how to connect your store and wallet.</span>
+        Warning: No wallet has been linked to your BTCPay Store.<br/>
+        See <a href="https://docs.btcpayserver.org/WalletSetup/" target="_blank" class="alert-link">this link</a> for more information on how to connect your store and wallet.
     </div>
 }
 <h4>Access token</h4>
@@ -21,14 +22,17 @@
 <div class="row">
     <div class="col-md-8">
         <a id="CreateNewToken" asp-action="CreateToken" class="btn btn-primary" role="button"><span class="fa fa-plus" asp-route-storeId="@this.Context.GetRouteValue("storeId")"></span> Create a new token</a>
-        <table class="table table-sm table-responsive-md">
-            <thead>
+
+        @if (Model.Tokens.Any())
+        {
+            <table class="table table-sm table-responsive-md">
+                <thead>
                 <tr>
                     <th>Label</th>
                     <th class="text-right">Actions</th>
                 </tr>
-            </thead>
-            <tbody>
+                </thead>
+                <tbody>
                 @foreach (var token in Model.Tokens)
                 {
                     <tr>
@@ -38,11 +42,12 @@
                         </td>
                     </tr>
                 }
-            </tbody>
-        </table>
+                </tbody>
+            </table>
+        }
     </div>
 </div>
-
+<hr class="my-5" />
 <h4>Legacy API Keys</h4>
 <div class="row">
     <div class="col-md-8">