diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
index dfdad4cb6..de6135e9c 100644
--- a/src/webui/www/private/scripts/client.js
+++ b/src/webui/www/private/scripts/client.js
@@ -1059,8 +1059,8 @@ window.addEventListener("DOMContentLoaded", () => {
         }).send();
     });
 
-    $("DlInfos").addEventListener("click", globalDownloadLimitFN);
-    $("UpInfos").addEventListener("click", globalUploadLimitFN);
+    $("DlInfos").addEventListener("click", () => { globalDownloadLimitFN(); });
+    $("UpInfos").addEventListener("click", () => { globalUploadLimitFN(); });
 
     $("showTopToolbarLink").addEventListener("click", (e) => {
         showTopToolbar = !showTopToolbar;
@@ -1206,7 +1206,7 @@ window.addEventListener("DOMContentLoaded", () => {
             $("mainWindowTabs").addClass("invisible");
     };
 
-    $("StatisticsLink").addEventListener("click", StatisticsLinkFN);
+    $("StatisticsLink").addEventListener("click", () => { StatisticsLinkFN(); });
 
     // main window tabs
 
@@ -1567,10 +1567,10 @@ window.addEventListener("DOMContentLoaded", () => {
 
     document.getElementById("torrentsFilterToolbar").addEventListener("change", (e) => { torrentsTable.updateTable(); });
 
-    $("transfersTabLink").addEventListener("click", showTransfersTab);
-    $("searchTabLink").addEventListener("click", showSearchTab);
-    $("rssTabLink").addEventListener("click", showRssTab);
-    $("logTabLink").addEventListener("click", showLogTab);
+    $("transfersTabLink").addEventListener("click", () => { showTransfersTab(); });
+    $("searchTabLink").addEventListener("click", () => { showSearchTab(); });
+    $("rssTabLink").addEventListener("click", () => { showRssTab(); });
+    $("logTabLink").addEventListener("click", () => { showLogTab(); });
     updateTabDisplay();
 
     const registerDragAndDrop = () => {
diff --git a/src/webui/www/private/scripts/contextmenu.js b/src/webui/www/private/scripts/contextmenu.js
index 979766ba6..ad1b92d02 100644
--- a/src/webui/www/private/scripts/contextmenu.js
+++ b/src/webui/www/private/scripts/contextmenu.js
@@ -440,7 +440,7 @@ window.qBittorrent.ContextMenu ??= (() => {
             const createMenuItem = (text, imgURL, clickFn) => {
                 const anchor = document.createElement("a");
                 anchor.textContent = text;
-                anchor.addEventListener("click", clickFn);
+                anchor.addEventListener("click", () => { clickFn(); });
 
                 const img = document.createElement("img");
                 img.src = imgURL;
@@ -495,7 +495,7 @@ window.qBittorrent.ContextMenu ??= (() => {
             const createMenuItem = (text, imgURL, clickFn) => {
                 const anchor = document.createElement("a");
                 anchor.textContent = text;
-                anchor.addEventListener("click", clickFn);
+                anchor.addEventListener("click", () => { clickFn(); });
 
                 const img = document.createElement("img");
                 img.src = imgURL;
diff --git a/src/webui/www/private/scripts/search.js b/src/webui/www/private/scripts/search.js
index 7db6064b0..5d44efd79 100644
--- a/src/webui/www/private/scripts/search.js
+++ b/src/webui/www/private/scripts/search.js
@@ -753,14 +753,15 @@ window.qBittorrent.Search ??= (() => {
     };
 
     const setupSearchTableEvents = function(enable) {
+        const clickHandler = (e) => { downloadSearchTorrent(); };
         if (enable) {
             $$(".searchTableRow").each((target) => {
-                target.addEventListener("dblclick", downloadSearchTorrent, false);
+                target.addEventListener("dblclick", clickHandler);
             });
         }
         else {
             $$(".searchTableRow").each((target) => {
-                target.removeEventListener("dblclick", downloadSearchTorrent, false);
+                target.removeEventListener("dblclick", clickHandler);
             });
         }
     };
diff --git a/src/webui/www/private/views/searchplugins.html b/src/webui/www/private/views/searchplugins.html
index b4d0672b7..1aee0bf7e 100644
--- a/src/webui/www/private/views/searchplugins.html
+++ b/src/webui/www/private/views/searchplugins.html
@@ -182,16 +182,18 @@
         };
 
         const setupSearchPluginTableEvents = function(enable) {
+            const clickHandler = (e) => { enablePlugin(); };
+            const menuHandler = (e) => { updateSearchPluginsTableContextMenuOffset(); };
             if (enable) {
                 $$(".searchPluginsTableRow").each((target) => {
-                    target.addEventListener("dblclick", enablePlugin, false);
-                    target.addEventListener("contextmenu", updateSearchPluginsTableContextMenuOffset, true);
+                    target.addEventListener("dblclick", clickHandler);
+                    target.addEventListener("contextmenu", menuHandler, true);
                 });
             }
             else {
                 $$(".searchPluginsTableRow").each((target) => {
-                    target.removeEventListener("dblclick", enablePlugin, false);
-                    target.removeEventListener("contextmenu", updateSearchPluginsTableContextMenuOffset, true);
+                    target.removeEventListener("dblclick", clickHandler);
+                    target.removeEventListener("contextmenu", menuHandler, true);
                 });
             }
         };