diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs
index c771ff0e4..c8d9ec8c1 100644
--- a/BTCPayServer.Tests/SeleniumTests.cs
+++ b/BTCPayServer.Tests/SeleniumTests.cs
@@ -1011,13 +1011,13 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("WalletNav-Receive")).Click();
             //generate a receiving address
             s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
-            Assert.True(s.Driver.FindElement(By.ClassName("qr-container")).Displayed);
+            Assert.True(s.Driver.FindElement(By.CssSelector("#address-tab .qr-container")).Displayed);
             var receiveAddr = s.Driver.FindElement(By.Id("address")).GetAttribute("value");
             //unreserve
             s.Driver.FindElement(By.CssSelector("button[value=unreserve-current-address]")).Click();
             //generate it again, should be the same one as before as nothing got used in the meantime
             s.Driver.FindElement(By.CssSelector("button[value=generate-new-address]")).Click();
-            Assert.True(s.Driver.FindElement(By.ClassName("qr-container")).Displayed);
+            Assert.True(s.Driver.FindElement(By.CssSelector("#address-tab .qr-container")).Displayed);
             Assert.Equal(receiveAddr, s.Driver.FindElement(By.Id("address")).GetAttribute("value"));
 
             //send money to addr and ensure it changed
diff --git a/BTCPayServer/Views/UIWallets/WalletReceive.cshtml b/BTCPayServer/Views/UIWallets/WalletReceive.cshtml
index b5cf8f2e5..33e69b473 100644
--- a/BTCPayServer/Views/UIWallets/WalletReceive.cshtml
+++ b/BTCPayServer/Views/UIWallets/WalletReceive.cshtml
@@ -40,38 +40,44 @@
                     </div>
                 </noscript>
                 <div class="only-for-js m-sm-0 p-sm-0" id="app">
-                    <div class="mb-4">
-                        <div class="qr-container tab-content mb-3" id="myTabContent">
-                            <img src="@Model.CryptoImage" class="qr-icon" alt="@Model.CryptoCode"/>
-                            <div class="tab-pane show active" id="link-tab" role="tabpanel">
-                                <vc:qr-code data="@Model.PaymentLink"/>
+                    <div class="mb-5">
+                        <div class="tab-content">
+                            <div class="tab-pane" id="link-tab" role="tabpanel">
+                                <div class="qr-container mb-3">
+                                    <img src="@Model.CryptoImage" class="qr-icon" alt="@Model.CryptoCode"/>
+                                    <vc:qr-code data="@Model.PaymentLink"/>
+                                </div>
+                                <div class="form-group">
+                                    <div class="input-group" data-clipboard="@Model.PaymentLink">
+                                        <input type="text" class="form-control" style="cursor:copy" readonly="readonly" value="@Model.PaymentLink" id="payment-link"/>
+                                        <button type="button" class="btn btn-outline-secondary p-2" style="width:7em;" data-clipboard-confirm>
+                                            <vc:icon symbol="copy"/>
+                                        </button>
+                                    </div>
+                                </div>
                             </div>
-                            <div class="tab-pane" id="address-tab" role="tabpanel">
-                                <vc:qr-code data="@Model.Address"/>
+                            <div class="tab-pane show active" id="address-tab" role="tabpanel">
+                                <div class="qr-container mb-3">
+                                    <img src="@Model.CryptoImage" class="qr-icon" alt="@Model.CryptoCode"/>
+                                    <vc:qr-code data="@Model.Address"/>
+                                </div>
+                                <div class="form-group">
+                                    <div class="input-group" data-clipboard="@Model.Address">
+                                        <input type="text" class="form-control" style="cursor:copy" readonly="readonly" value="@Model.Address" id="address"/>
+                                        <button type="button" class="input-group-text btn btn-outline-secondary p-2" style="width:7em;" data-clipboard-confirm>
+                                            <vc:icon symbol="copy"/>
+                                        </button>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                         <div class="nav">
-                            <a class="btcpay-pill active" data-bs-toggle="tab" href="#link-tab">Link</a>
-                            <a class="btcpay-pill" data-bs-toggle="tab" href="#address-tab">Address</a>
+                            <a class="btcpay-pill active" data-bs-toggle="tab" href="#address-tab">Address</a>
+                            <a class="btcpay-pill " data-bs-toggle="tab" href="#link-tab">Link</a>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <div class="input-group" data-clipboard="@Model.Address">
-                            <input type="text" class="form-control" style="cursor:copy" readonly="readonly" value="@Model.Address" id="address"/>
-                            <button type="button" class="input-group-text btn btn-outline-secondary p-2" style="width:7em;" data-clipboard-confirm>
-                                <vc:icon symbol="copy"/>
-                            </button>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="input-group" data-clipboard="@Model.PaymentLink">
-                            <input type="text" class="form-control" style="cursor:copy" readonly="readonly" value="@Model.PaymentLink" id="payment-link"/>
-                            <button type="button" class="btn btn-outline-secondary p-2" style="width:7em;" data-clipboard-confirm>
-                                <vc:icon symbol="copy"/>
-                            </button>
-                        </div>
-                    </div>
-                    <div class="row mt-4">
+                    
+                    <div class="row">
                         <div class="col-12 col-sm-6">
                             <button type="submit" name="command" value="generate-new-address" class="btn btn-primary w-100">Generate another address</button>
                         </div>