diff --git a/src/web/Manager.mjs b/src/web/Manager.mjs
index 3fabc774..77f3cf20 100755
--- a/src/web/Manager.mjs
+++ b/src/web/Manager.mjs
@@ -129,7 +129,7 @@ class Manager {
         // Controls
         document.getElementById("bake").addEventListener("click", this.controls.bakeClick.bind(this.controls));
         document.getElementById("auto-bake").addEventListener("change", this.controls.autoBakeChange.bind(this.controls));
-        document.getElementById("auto-bake").addEventListener("keydown", this.controls.keyboardCheckAutoBake.bind(this.controls));
+        document.getElementById("auto-bake").addEventListener("keydown", this.controls.autoBakeKeyboardHandler.bind(this.controls));
         document.getElementById("step").addEventListener("click", this.controls.stepClick.bind(this.controls));
         document.getElementById("clr-recipe").addEventListener("click", this.controls.clearRecipeClick.bind(this.controls));
         document.getElementById("save").addEventListener("click", this.controls.saveClick.bind(this.controls));
diff --git a/src/web/waiters/ControlsWaiter.mjs b/src/web/waiters/ControlsWaiter.mjs
index 7fac5339..3e43f3da 100755
--- a/src/web/waiters/ControlsWaiter.mjs
+++ b/src/web/waiters/ControlsWaiter.mjs
@@ -51,15 +51,6 @@ class ControlsWaiter {
         }
     }
 
-    /**
-     * Handles the Auto Bake checkbox based on keyboard.
-     *
-     */
-    keyboardCheckAutoBake() {
-        const autoBakeId = document.getElementById("auto-bake");
-        autoBakeId.addEventListener("keydown", this.autoBakeKeyboardHandler, false);
-    }
-
     /**
      * Checks or unchecks the Auto Bake checkbox with "Enter"
      * @param {Event} ev