diff --git a/src/js/input-controller.js b/src/js/input-controller.js
index 5d186972c..91418afc0 100644
--- a/src/js/input-controller.js
+++ b/src/js/input-controller.js
@@ -710,6 +710,16 @@ $(document).keydown((event) => {
       event.preventDefault();
       handleChar(char, TestLogic.input.current.length);
     }
+
+    if (Config.keymapMode === "next" && Config.mode !== "zen") {
+      Keymap.highlightKey(
+        TestLogic.words
+          .getCurrent()
+          .charAt(TestLogic.input.current.length)
+          .toString()
+          .toUpperCase()
+      );
+    }
   }
 });