diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 23fed18fb..5e9291f48 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -138,6 +138,7 @@
 
 	<ItemGroup>
     <Watch Include="Views\**\*.*"></Watch>
+    <Watch Remove="Views\Shared\LocalhostBrowserSupport.cshtml" />
     <Watch Remove="Views\UIAccount\CheatPermissions.cshtml" />
     <Watch Remove="Views\UIReports\StoreReports.cshtml" />
     <Content Update="Views\UIApps\_ViewImports.cshtml">
diff --git a/BTCPayServer/Views/Shared/LocalhostBrowserSupport.cshtml b/BTCPayServer/Views/Shared/LocalhostBrowserSupport.cshtml
new file mode 100644
index 000000000..603ad7f9c
--- /dev/null
+++ b/BTCPayServer/Views/Shared/LocalhostBrowserSupport.cshtml
@@ -0,0 +1,22 @@
+<div id="walletAlert" class="alert alert-warning alert-dismissible my-4" style="display:none;" role="alert">
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
+        <vc:icon symbol="close" />
+    </button>
+    <span id="alertMessage"></span>
+</div>
+<script>
+		var alertMsg = document.getElementById("alertMessage");
+		var walletAlert = document.getElementById("walletAlert");
+		var isSafari = window.safari !== undefined;
+		if (isSafari)
+		{
+			alertMsg.innerHTML = "Safari doesn't support BTCPay Server Vault. Please use a different browser. (<a class=\"alert-link\" href=\"https://bugs.webkit.org/show_bug.cgi?id=171934\" target=\"_blank\" rel=\"noreferrer noopener\">More information</a>)";
+			walletAlert.style.display = null;
+		}
+		var isBrave = navigator.brave !== undefined;
+		if (isBrave)
+		{
+			alertMsg.innerHTML = "Brave supports BTCPay Server Vault, but you need to disable Brave Shields. (<a class=\"alert-link\" href=\"https://www.updateland.com/how-to-turn-off-brave-shields/\" target=\"_blank\" rel=\"noreferrer noopener\">More information</a>)";
+			walletAlert.style.display = null;
+		}
+</script>
diff --git a/BTCPayServer/Views/UIPullPayment/SetupBoltcard.cshtml b/BTCPayServer/Views/UIPullPayment/SetupBoltcard.cshtml
index 2e97cb8b0..f01b3af97 100644
--- a/BTCPayServer/Views/UIPullPayment/SetupBoltcard.cshtml
+++ b/BTCPayServer/Views/UIPullPayment/SetupBoltcard.cshtml
@@ -15,12 +15,7 @@
     <p class="lead text-secondary mt-3">Using BTCPay Server Vault (NFC)</p>
 </header>
 
-<div id="walletAlert" class="alert alert-warning alert-dismissible my-4" style="display:none;" role="alert">
-    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
-        <vc:icon symbol="close" />
-    </button>
-    <span id="alertMessage"></span>
-</div>
+<partial name="LocalhostBrowserSupport" />
 
 <div id="body" class="my-4">
 	<form id="broadcastForm" method="post" style="display:none;">
@@ -65,19 +60,5 @@
         document.addEventListener("DOMContentLoaded", function () {
             askSign();
         });
-		var alertMsg = document.getElementById("alertMessage");
-		var walletAlert = document.getElementById("walletAlert");
-		var isSafari = window.safari !== undefined;
-		if (isSafari)
-		{
-			alertMsg.innerHTML = "Safari doesn't support BTCPay Server Vault. Please use a different browser. (<a class=\"alert-link\" href=\"https://bugs.webkit.org/show_bug.cgi?id=171934\" target=\"_blank\" rel=\"noreferrer noopener\">More information</a>)";
-			walletAlert.style.display = null;
-		}
-		var isBrave = navigator.brave !== undefined;
-		if (isBrave)
-		{
-			alertMsg.innerHTML = "Brave supports BTCPay Server Vault, but you need to disable Brave Shields. (<a class=\"alert-link\" href=\"https://www.updateland.com/how-to-turn-off-brave-shields/\" target=\"_blank\" rel=\"noreferrer noopener\">More information</a>)";
-			walletAlert.style.display = null;
-		}
     </script>
 }
diff --git a/BTCPayServer/Views/UIStores/ImportWallet/ConfirmAddresses.cshtml b/BTCPayServer/Views/UIStores/ImportWallet/ConfirmAddresses.cshtml
index a2dc389d4..3471c6965 100644
--- a/BTCPayServer/Views/UIStores/ImportWallet/ConfirmAddresses.cshtml
+++ b/BTCPayServer/Views/UIStores/ImportWallet/ConfirmAddresses.cshtml
@@ -20,6 +20,8 @@
     <div asp-validation-summary="All" class="text-danger"></div>
 }
 
+<partial name="LocalhostBrowserSupport" />
+
 <template id="modal-template">
     <div class="modal-dialog" role="document">
         <form class="modal-content" method="post" enctype="multipart/form-data">
diff --git a/BTCPayServer/Views/UIStores/ImportWallet/Hardware.cshtml b/BTCPayServer/Views/UIStores/ImportWallet/Hardware.cshtml
index 907445b8f..b4cd88e7f 100644
--- a/BTCPayServer/Views/UIStores/ImportWallet/Hardware.cshtml
+++ b/BTCPayServer/Views/UIStores/ImportWallet/Hardware.cshtml
@@ -20,6 +20,8 @@
     <div asp-validation-summary="All" class="text-danger"></div>
 }
 
+<partial name="LocalhostBrowserSupport" />
+
 <div class="row mt-5 mb-4">
     <div class="col-md-8 mx-auto">
         <div id="vault-status" class="mb-4"></div>
diff --git a/BTCPayServer/Views/UIWallets/WalletSendVault.cshtml b/BTCPayServer/Views/UIWallets/WalletSendVault.cshtml
index 88893163e..53bc46dea 100644
--- a/BTCPayServer/Views/UIWallets/WalletSendVault.cshtml
+++ b/BTCPayServer/Views/UIWallets/WalletSendVault.cshtml
@@ -25,12 +25,7 @@
     <p class="lead text-secondary mt-3">Using BTCPay Server Vault</p>
 </header>
 
-<div id="walletAlert" class="alert alert-warning alert-dismissible my-4" style="display:none;" role="alert">
-    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
-        <vc:icon symbol="close" />
-    </button>
-    <span id="alertMessage"></span>
-</div>
+<partial name="LocalhostBrowserSupport" />
 
 <div id="body" class="my-4">
     <form id="broadcastForm" asp-action="WalletSendVault" asp-route-walletId="@walletId" method="post" style="display:none;">
@@ -77,19 +72,5 @@
         document.addEventListener("DOMContentLoaded", function () {
             askSign();
         });
-		var alertMsg = document.getElementById("alertMessage");
-		var walletAlert = document.getElementById("walletAlert");
-		var isSafari = window.safari !== undefined;
-		if (isSafari)
-		{
-			alertMsg.innerHTML = "Safari doesn't support BTCPay Server Vault. Please use a different browser. (<a class=\"alert-link\" href=\"https://bugs.webkit.org/show_bug.cgi?id=171934\" target=\"_blank\" rel=\"noreferrer noopener\">More information</a>)";
-			walletAlert.style.display = null;
-		}
-		var isBrave = navigator.brave !== undefined;
-		if (isBrave)
-		{
-			alertMsg.innerHTML = "Brave supports BTCPay Server Vault, but you need to disable Brave Shields. (<a class=\"alert-link\" href=\"https://www.updateland.com/how-to-turn-off-brave-shields/\" target=\"_blank\" rel=\"noreferrer noopener\">More information</a>)";
-			walletAlert.style.display = null;
-		}
     </script>
 }