diff --git a/src/webui/www/private/addpeers.html b/src/webui/www/private/addpeers.html
index 84b42417a..8e00eda9b 100644
--- a/src/webui/www/private/addpeers.html
+++ b/src/webui/www/private/addpeers.html
@@ -12,21 +12,16 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const hash = new URI().getData("hash");
             if (!hash)
                 return;
diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html
index 4ba0938b4..22cdffcee 100644
--- a/src/webui/www/private/addtrackers.html
+++ b/src/webui/www/private/addtrackers.html
@@ -13,19 +13,14 @@
         "use strict";
 
         window.addEventListener("DOMContentLoaded", () => {
-            new Keyboard({
-                defaultEventType: "keydown",
-                events: {
-                    "Escape": function(event) {
-                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Escape":
                         event.preventDefault();
-                    },
-                    "Esc": function(event) {
                         window.parent.qBittorrent.Client.closeFrameWindow(window);
-                        event.preventDefault();
-                    }
+                        break;
                 }
-            }).activate();
+            });
 
             $("trackersUrls").focus();
             $("addTrackersButton").addEventListener("click", (e) => {
diff --git a/src/webui/www/private/addwebseeds.html b/src/webui/www/private/addwebseeds.html
index 1a15b890d..d5679b54f 100644
--- a/src/webui/www/private/addwebseeds.html
+++ b/src/webui/www/private/addwebseeds.html
@@ -13,22 +13,17 @@
         "use strict";
 
         window.addEventListener("DOMContentLoaded", () => {
-            new Keyboard({
-                defaultEventType: "keydown",
-                events: {
-                    "Escape": function(event) {
-                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Escape":
                         event.preventDefault();
-                    },
-                    "Esc": function(event) {
                         window.parent.qBittorrent.Client.closeFrameWindow(window);
-                        event.preventDefault();
-                    }
+                        break;
                 }
-            }).activate();
+            });
 
             $("urls").focus();
-            $("addWebSeedsButton").addEvent("click", (e) => {
+            $("addWebSeedsButton").addEventListener("click", (e) => {
                 e.stopPropagation();
                 const hash = new URI().getData("hash");
                 new Request({
diff --git a/src/webui/www/private/confirmtrackerdeletion.html b/src/webui/www/private/confirmtrackerdeletion.html
index 3d153d1bb..673595f5f 100644
--- a/src/webui/www/private/confirmtrackerdeletion.html
+++ b/src/webui/www/private/confirmtrackerdeletion.html
@@ -18,11 +18,11 @@
             $("confirmDeleteTrackerText").textContent = "QBT_TR(Are you sure you want to remove tracker %1 from all torrents?)QBT_TR[CONTEXT=TrackersFilterWidget]".replace("%1", `"${host}"`);
 
             $("cancelBtn").focus();
-            $("cancelBtn").addEvent("click", (e) => {
+            $("cancelBtn").addEventListener("click", (e) => {
                 e.stopPropagation();
                 window.parent.qBittorrent.Client.closeFrameWindow(window);
             });
-            $("confirmBtn").addEvent("click", (e) => {
+            $("confirmBtn").addEventListener("click", (e) => {
                 e.stopPropagation();
                 const cmd = "api/v2/torrents/removeTrackers";
                 new Request({
diff --git a/src/webui/www/private/downloadlimit.html b/src/webui/www/private/downloadlimit.html
index 89b58c671..62ac3e750 100644
--- a/src/webui/www/private/downloadlimit.html
+++ b/src/webui/www/private/downloadlimit.html
@@ -33,6 +33,19 @@
     <script>
         "use strict";
 
+        window.addEventListener("keydown", (event) => {
+            switch (event.key) {
+                case "Enter":
+                    event.preventDefault();
+                    $("applyButton").click();
+                    break;
+                case "Escape":
+                    event.preventDefault();
+                    window.parent.qBittorrent.Client.closeFrameWindow(window);
+                    break;
+            }
+        });
+
         const hashes = new URI().getData("hashes").split("|");
         const setDlLimit = () => {
             const limit = Number($("dllimitUpdatevalue").value) * 1024;
@@ -64,24 +77,6 @@
             }
         };
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(event) {
-                    $("applyButton").click();
-                    event.preventDefault();
-                },
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         $("dllimitUpdatevalue").focus();
 
         MochaUI.addDlLimitSlider(hashes);
diff --git a/src/webui/www/private/editfeedurl.html b/src/webui/www/private/editfeedurl.html
index 3a200863e..fd97fc477 100644
--- a/src/webui/www/private/editfeedurl.html
+++ b/src/webui/www/private/editfeedurl.html
@@ -13,25 +13,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": (event) => {
-                    event.preventDefault();
-                    $("submitButton").click();
-                },
-                "Escape": (event) => {
-                    event.preventDefault();
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                },
-                "Esc": (event) => {
-                    event.preventDefault();
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                }
-            }
-        }).activate();
-
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("submitButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const currentUrl = new URI().getData("url");
 
             $("url").value = currentUrl;
diff --git a/src/webui/www/private/edittracker.html b/src/webui/www/private/edittracker.html
index fb31233e2..38a3b0408 100644
--- a/src/webui/www/private/edittracker.html
+++ b/src/webui/www/private/edittracker.html
@@ -13,23 +13,18 @@
         "use strict";
 
         window.addEventListener("DOMContentLoaded", () => {
-            new Keyboard({
-                defaultEventType: "keydown",
-                events: {
-                    "Enter": function(event) {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
                         $("editTrackerButton").click();
+                        break;
+                    case "Escape":
                         event.preventDefault();
-                    },
-                    "Escape": function(event) {
                         window.parent.qBittorrent.Client.closeFrameWindow(window);
-                        event.preventDefault();
-                    },
-                    "Esc": function(event) {
-                        window.parent.qBittorrent.Client.closeFrameWindow(window);
-                        event.preventDefault();
-                    }
+                        break;
                 }
-            }).activate();
+            });
 
             const currentUrl = new URI().getData("url");
             if (!currentUrl)
diff --git a/src/webui/www/private/editwebseed.html b/src/webui/www/private/editwebseed.html
index e4e05d002..82bcba089 100644
--- a/src/webui/www/private/editwebseed.html
+++ b/src/webui/www/private/editwebseed.html
@@ -13,29 +13,24 @@
         "use strict";
 
         window.addEventListener("DOMContentLoaded", () => {
-            new Keyboard({
-                defaultEventType: "keydown",
-                events: {
-                    "Enter": function(event) {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
                         $("editWebSeedButton").click();
+                        break;
+                    case "Escape":
                         event.preventDefault();
-                    },
-                    "Escape": function(event) {
                         window.parent.qBittorrent.Client.closeFrameWindow(window);
-                        event.preventDefault();
-                    },
-                    "Esc": function(event) {
-                        window.parent.qBittorrent.Client.closeFrameWindow(window);
-                        event.preventDefault();
-                    }
+                        break;
                 }
-            }).activate();
+            });
 
             const origUrl = new URI().getData("url");
             $("url").value = decodeURIComponent(origUrl);
             $("url").focus();
 
-            $("editWebSeedButton").addEvent("click", (e) => {
+            $("editWebSeedButton").addEventListener("click", (e) => {
                 e.stopPropagation();
                 const hash = new URI().getData("hash");
                 new Request({
diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
index aad167a22..f2b6d27d5 100644
--- a/src/webui/www/private/newcategory.html
+++ b/src/webui/www/private/newcategory.html
@@ -14,25 +14,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(event) {
-                    $("categoryNameButton").click();
-                    event.preventDefault();
-                },
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("categoryNameButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const uriAction = window.qBittorrent.Misc.safeTrim(new URI().getData("action"));
             const uriHashes = window.qBittorrent.Misc.safeTrim(new URI().getData("hashes"));
             const uriCategoryName = window.qBittorrent.Misc.safeTrim(new URI().getData("categoryName"));
diff --git a/src/webui/www/private/newfeed.html b/src/webui/www/private/newfeed.html
index 3c7529188..999c1c07c 100644
--- a/src/webui/www/private/newfeed.html
+++ b/src/webui/www/private/newfeed.html
@@ -13,24 +13,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": (event) => {
-                    $("submitButton").click();
-                    event.preventDefault();
-                },
-                "Escape": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("submitButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             $("feedURL").focus();
             const path = new URI().getData("path");
             $("submitButton").addEventListener("click", (e) => {
diff --git a/src/webui/www/private/newfolder.html b/src/webui/www/private/newfolder.html
index 92d71404f..463a6fdc8 100644
--- a/src/webui/www/private/newfolder.html
+++ b/src/webui/www/private/newfolder.html
@@ -14,24 +14,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": (event) => {
-                    $("submitButton").click();
-                    event.preventDefault();
-                },
-                "Escape": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("submitButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             $("folderName").focus();
             const path = new URI().getData("path");
             $("submitButton").addEventListener("click", (e) => {
diff --git a/src/webui/www/private/newrule.html b/src/webui/www/private/newrule.html
index 533135850..acf6714c5 100644
--- a/src/webui/www/private/newrule.html
+++ b/src/webui/www/private/newrule.html
@@ -13,24 +13,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": (event) => {
-                    $("submitButton").click();
-                    event.preventDefault();
-                },
-                "Escape": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("submitButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             $("name").focus();
             $("submitButton").addEventListener("click", (e) => {
                 e.preventDefault();
diff --git a/src/webui/www/private/newtag.html b/src/webui/www/private/newtag.html
index 4af66b583..1b98e29bb 100644
--- a/src/webui/www/private/newtag.html
+++ b/src/webui/www/private/newtag.html
@@ -13,25 +13,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(event) {
-                    $("tagNameButton").click();
-                    event.preventDefault();
-                },
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("tagNameButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const uriAction = window.qBittorrent.Misc.safeTrim(new URI().getData("action"));
             const uriHashes = window.qBittorrent.Misc.safeTrim(new URI().getData("hashes"));
 
diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
index 500ea1950..445fad207 100644
--- a/src/webui/www/private/rename.html
+++ b/src/webui/www/private/rename.html
@@ -13,25 +13,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(event) {
-                    $("renameButton").click();
-                    event.preventDefault();
-                },
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("renameButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const name = new URI().getData("name");
             // set text field to current value
             if (name)
diff --git a/src/webui/www/private/rename_feed.html b/src/webui/www/private/rename_feed.html
index 52fb65aa1..90fef405f 100644
--- a/src/webui/www/private/rename_feed.html
+++ b/src/webui/www/private/rename_feed.html
@@ -13,24 +13,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": (event) => {
-                    $("renameButton").click();
-                    event.preventDefault();
-                },
-                "Escape": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("renameButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const oldPath = new URI().getData("oldPath");
 
             $("rename").value = oldPath;
diff --git a/src/webui/www/private/rename_file.html b/src/webui/www/private/rename_file.html
index e95795ef8..a7b4c5a46 100644
--- a/src/webui/www/private/rename_file.html
+++ b/src/webui/www/private/rename_file.html
@@ -14,25 +14,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(event) {
-                    $("renameButton").click();
-                    event.preventDefault();
-                },
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("renameButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const hash = new URI().getData("hash");
             const oldPath = new URI().getData("path");
             const isFolder = ((new URI().getData("isFolder")) === "true");
diff --git a/src/webui/www/private/rename_files.html b/src/webui/www/private/rename_files.html
index 54fcd4205..bf907755f 100644
--- a/src/webui/www/private/rename_files.html
+++ b/src/webui/www/private/rename_files.html
@@ -61,7 +61,7 @@
 
             // Register keyboard events to modal window
             // https://github.com/qbittorrent/qBittorrent/pull/18687#discussion_r1135045726
-            const keyboard = new Keyboard({
+            new Keyboard({
                 defaultEventType: "keydown",
                 events: {
                     "Escape": function(event) {
@@ -73,8 +73,7 @@
                         event.preventDefault();
                     }
                 }
-            });
-            keyboard.activate();
+            }).activate();
 
             const fileRenamer = new window.qBittorrent.MultiRename.RenameFiles();
             fileRenamer.hash = data.hash;
diff --git a/src/webui/www/private/rename_rule.html b/src/webui/www/private/rename_rule.html
index 66bc513b5..5f97ad9c3 100644
--- a/src/webui/www/private/rename_rule.html
+++ b/src/webui/www/private/rename_rule.html
@@ -13,24 +13,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": (event) => {
-                    $("renameButton").click();
-                    event.preventDefault();
-                },
-                "Escape": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": (event) => {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("renameButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const oldName = new URI().getData("rule");
 
             $("rename").value = oldName;
diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
index 70381f547..6151b66d4 100644
--- a/src/webui/www/private/scripts/client.js
+++ b/src/webui/www/private/scripts/client.js
@@ -1728,35 +1728,30 @@ window.addEventListener("DOMContentLoaded", () => {
     };
     registerDragAndDrop();
 
-    new Keyboard({
-        defaultEventType: "keydown",
-        events: {
-            "ctrl+a": function(event) {
+    window.addEventListener("keydown", (event) => {
+        switch (event.key) {
+            case "a":
+            case "A":
+                if (event.ctrlKey) {
+                    if ((event.target.nodeName === "INPUT") || (event.target.nodeName === "TEXTAREA"))
+                        return;
+                    if (event.target.isContentEditable)
+                        return;
+                    event.preventDefault();
+                    torrentsTable.selectAll();
+                }
+                break;
+
+            case "Delete":
                 if ((event.target.nodeName === "INPUT") || (event.target.nodeName === "TEXTAREA"))
                     return;
                 if (event.target.isContentEditable)
                     return;
-                torrentsTable.selectAll();
                 event.preventDefault();
-            },
-            "delete": function(event) {
-                if ((event.target.nodeName === "INPUT") || (event.target.nodeName === "TEXTAREA"))
-                    return;
-                if (event.target.isContentEditable)
-                    return;
-                deleteSelectedTorrentsFN();
-                event.preventDefault();
-            },
-            "shift+delete": (event) => {
-                if ((event.target.nodeName === "INPUT") || (event.target.nodeName === "TEXTAREA"))
-                    return;
-                if (event.target.isContentEditable)
-                    return;
-                deleteSelectedTorrentsFN(true);
-                event.preventDefault();
-            }
+                deleteSelectedTorrentsFN(event.shiftKey);
+                break;
         }
-    }).activate();
+    });
 
     new ClipboardJS(".copyToClipboard", {
         text: (trigger) => {
diff --git a/src/webui/www/private/scripts/search.js b/src/webui/www/private/scripts/search.js
index 80ab62afc..42466229c 100644
--- a/src/webui/www/private/scripts/search.js
+++ b/src/webui/www/private/scripts/search.js
@@ -139,28 +139,25 @@ window.qBittorrent.Search ??= (() => {
             }, window.qBittorrent.Misc.FILTER_INPUT_DELAY);
         });
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(e) {
-                    // accept enter key as a click
-                    e.preventDefault();
-                    e.stopPropagation();
+        document.getElementById("SearchPanel").addEventListener("keydown", (event) => {
+            switch (event.key) {
+                case "Enter": {
+                    event.preventDefault();
+                    event.stopPropagation();
 
-                    const elem = e.event.srcElement;
-                    if (elem.className.contains("searchInputField")) {
-                        document.getElementById("startSearchButton").click();
-                        return;
-                    }
-
-                    switch (elem.id) {
+                    switch (event.target.id) {
                         case "manageSearchPlugins":
                             manageSearchPlugins();
                             break;
+                        case "searchPattern":
+                            document.getElementById("startSearchButton").click();
+                            break;
                     }
+
+                    break;
                 }
             }
-        }).activate();
+        });
 
         // restore search tabs
         const searchJobs = JSON.parse(LocalPreferences.get("search_jobs", "[]"));
diff --git a/src/webui/www/private/setlocation.html b/src/webui/www/private/setlocation.html
index 9cccd673a..cecdb29d7 100644
--- a/src/webui/www/private/setlocation.html
+++ b/src/webui/www/private/setlocation.html
@@ -13,25 +13,20 @@
     <script>
         "use strict";
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(event) {
-                    $("setLocationButton").click();
-                    event.preventDefault();
-                },
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("setLocationButton").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const path = new URI().getData("path");
 
             // set text field to current value
diff --git a/src/webui/www/private/shareratio.html b/src/webui/www/private/shareratio.html
index 49c7e033f..8c6f36fff 100644
--- a/src/webui/www/private/shareratio.html
+++ b/src/webui/www/private/shareratio.html
@@ -16,25 +16,20 @@
         const UseGlobalLimit = -2;
         const NoLimit = -1;
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(event) {
-                    $("save").click();
-                    event.preventDefault();
-                },
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         window.addEventListener("DOMContentLoaded", () => {
+            window.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        event.preventDefault();
+                        $("save").click();
+                        break;
+                    case "Escape":
+                        event.preventDefault();
+                        window.parent.qBittorrent.Client.closeFrameWindow(window);
+                        break;
+                }
+            });
+
             const hashesList = new URI().getData("hashes").split("|");
             const origValues = new URI().getData("orig").split("|");
 
diff --git a/src/webui/www/private/uploadlimit.html b/src/webui/www/private/uploadlimit.html
index 7df19f75b..8494eab31 100644
--- a/src/webui/www/private/uploadlimit.html
+++ b/src/webui/www/private/uploadlimit.html
@@ -33,6 +33,19 @@
     <script>
         "use strict";
 
+        window.addEventListener("keydown", (event) => {
+            switch (event.key) {
+                case "Enter":
+                    event.preventDefault();
+                    $("applyButton").click();
+                    break;
+                case "Escape":
+                    event.preventDefault();
+                    window.parent.qBittorrent.Client.closeFrameWindow(window);
+                    break;
+            }
+        });
+
         const hashes = new URI().getData("hashes").split("|");
         const setUpLimit = () => {
             const limit = Number($("uplimitUpdatevalue").value) * 1024;
@@ -64,24 +77,6 @@
             }
         };
 
-        new Keyboard({
-            defaultEventType: "keydown",
-            events: {
-                "Enter": function(event) {
-                    $("applyButton").click();
-                    event.preventDefault();
-                },
-                "Escape": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                },
-                "Esc": function(event) {
-                    window.parent.qBittorrent.Client.closeFrameWindow(window);
-                    event.preventDefault();
-                }
-            }
-        }).activate();
-
         $("uplimitUpdatevalue").focus();
 
         MochaUI.addUpLimitSlider(hashes);
diff --git a/src/webui/www/private/views/installsearchplugin.html b/src/webui/www/private/views/installsearchplugin.html
index 39b1ccaef..db0520120 100644
--- a/src/webui/www/private/views/installsearchplugin.html
+++ b/src/webui/www/private/views/installsearchplugin.html
@@ -38,22 +38,28 @@
         };
 
         const setup = () => {
-            new Keyboard({
-                defaultEventType: "keydown",
-                events: {
-                    "Enter": function(e) {
-                        // accept enter key as a click
-                        e.preventDefault();
-                        e.stopPropagation();
+            const windowEl = document.getElementById("installSearchPlugin");
 
-                        const elem = e.event.srcElement;
-                        if ((elem.id === "newPluginPath") || (elem.id === "newPluginOk"))
-                            newPluginOk();
-                        else if (elem.id === "newPluginCancel")
-                            window.qBittorrent.Client.closeWindow(document.getElementById("installSearchPlugin"));
-                    }
+            windowEl.addEventListener("keydown", (event) => {
+                switch (event.key) {
+                    case "Enter":
+                        // accept enter key as a click
+                        event.preventDefault();
+                        event.stopPropagation();
+
+                        switch (event.target.id) {
+                            case "newPluginCancel":
+                                window.qBittorrent.Client.closeWindow(windowEl);
+                                break;
+                            case "newPluginOk":
+                            case "newPluginPath":
+                                newPluginOk();
+                                break;
+                        }
+
+                        break;
                 }
-            }).activate();
+            });
 
             $("newPluginPath").select();
         };