diff --git a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
index a96181699..6fc103d84 100644
--- a/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
+++ b/BTCPayServer/Views/Apps/UpdateCrowdfund.cshtml
@@ -195,7 +195,10 @@
                                    target="viewapp_@Model.AppId"><span class="fa fa-external-link"></span></a>
                             </div>
                         }
-                        <a class="btn btn-outline-primary" target="_blank" asp-action="ListApps">Back to the app list</a>
+                        <div class="btn-group">
+                            <a class="btn btn-outline-primary" asp-action="ListApps">Back to the app list</a>
+                            <a class="btn btn-outline-primary" asp-action="ListApps" target="viewapp_@Model.AppId"><span class="fa fa-external-link"></span></a>
+                        </div>
                     </div>
                 </form>
             </div>
diff --git a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
index 6bb1123fc..2b3dfa8da 100644
--- a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
+++ b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
@@ -121,7 +121,10 @@
                             <a class="btn btn-outline-primary" asp-action="ViewPointOfSale" asp-controller="AppsPublic" asp-route-appId="@Model.Id"
                                target="viewapp_@Model.Id"><span class="fa fa-external-link"></span></a>
                         </div>
-                        <a class="btn btn-outline-primary" target="_blank" asp-action="ListApps">Back to the app list</a>
+                        <div class="btn-group">
+                            <a class="btn btn-outline-primary" asp-action="ListApps">Back to the app list</a>
+                            <a class="btn btn-outline-primary" asp-action="ListApps" target="viewapp_@Model.Id"><span class="fa fa-external-link"></span></a>
+                        </div>
                     </div>
                     <div class="form-group">
                         <div class="accordion" id="accordian-dev-info">