diff --git a/BTCPayServer/Views/Invoice/Checkout.cshtml b/BTCPayServer/Views/Invoice/Checkout.cshtml
index 73b73c8e2..765a717a0 100644
--- a/BTCPayServer/Views/Invoice/Checkout.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout.cshtml
@@ -84,16 +84,23 @@
 
                         <select asp-for="DefaultLang"
                                 class="cmblang reverse invisible"
-                                onkeypress="if(event.keyCode==13){ $(this).click();}"
-                                onchange="changeLanguage($(this).val())"
                                 asp-items="@langService.GetLanguages().Select((language) => new SelectListItem(language.DisplayName,language.Code, false))"></select>
 
                         <script>
-                            var languageSelectorPrettyDropdown;
                             $(function () {
                                 // REVIEW: don't use initDropdown method but rather directly initialize select whenever you are using it
                                 $("#DefaultLang").val(startingLanguage);
-                                languageSelectorPrettyDropdown = initDropdown("#DefaultLang");
+                                var languageSelectorPrettyDropdown = initDropdown("#DefaultLang");
+
+                                languageSelectorPrettyDropdown.change(function() {
+                                    changeLanguage(languageSelectorPrettyDropdown.val());
+                                });
+
+                                languageSelectorPrettyDropdown.keypress(function(event) {
+                                    if (event.keyCode == 13) { 
+                                        languageSelectorPrettyDropdown.click();
+                                    }
+                                });
                             });
 
                             function initDropdown(selector) {
diff --git a/BTCPayServer/Views/Stores/ModifyWebhook.cshtml b/BTCPayServer/Views/Stores/ModifyWebhook.cshtml
index fd8290293..5ac587aac 100644
--- a/BTCPayServer/Views/Stores/ModifyWebhook.cshtml
+++ b/BTCPayServer/Views/Stores/ModifyWebhook.cshtml
@@ -43,7 +43,7 @@
             
             <h4 class="mb-3">Events</h4>
             <label asp-for="Everything" class="form-label">Which events would you like to trigger this webhook?</label>
-            <select asp-for="Everything" class="form-select w-auto mb-3" onchange="this.dataset.value=this.value">
+            <select asp-for="Everything" class="form-select w-auto mb-3">
                 <option value="true">Send me everything</option>
                 <option value="false">Send specific events</option>
             </select>
@@ -130,4 +130,9 @@
 
 @section PageFootContent {
     <partial name="_ValidationScriptsPartial" />
+    <script>
+        delegate('change', '#Everything', function (e) {
+            e.target.dataset.value = e.target.value;
+        });
+    </script>
 }
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index c40590262..411d3ef59 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -258,7 +258,7 @@
                         <a href="https://docs.btcpayserver.org/FAQ/Stores/#consider-the-invoice-confirmed-when-the-payment-transaction" target="_blank" rel="noreferrer noopener">
                             <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
                         </a>
-                        <select asp-for="SpeedPolicy" class="form-select w-auto" onchange="document.getElementById('unconfirmed-warning').hidden = this.value !== '0';">
+                        <select asp-for="SpeedPolicy" class="form-select w-auto">
                             <option value="0">Is unconfirmed</option>
                             <option value="1">Has at least 1 confirmation</option>
                             <option value="3">Has at least 2 confirmations</option>
@@ -351,4 +351,9 @@
 
 @section PageFootContent {
     <partial name="_ValidationScriptsPartial" />
+    <script>
+        delegate('change', '#SpeedPolicy', e => {
+            document.getElementById('unconfirmed-warning').hidden = e.target.value !== '0';
+        });
+    </script>
 }