diff --git a/frontend/src/ts/elements/keymap.ts b/frontend/src/ts/elements/keymap.ts
index b469b344bb86..4ffdae0bf6cb 100644
--- a/frontend/src/ts/elements/keymap.ts
+++ b/frontend/src/ts/elements/keymap.ts
@@ -279,7 +279,7 @@ function buildRow(options: {
         // potential second space in next loop iterations will be empty:
         layoutDisplay = "";
       } else {
-        keysHtml += `<div class="keymapKey ${side}">
+        keysHtml += `<div class="keymapKey ${side}" data-key="${keyVisualValue.join(keyDataDelimiter)}">
               <div class="letter">${keyDisplay}</div>
             </div>`;
         r5Grid += "1";
@@ -586,7 +586,7 @@ async function updateLegends(): Promise<void> {
 
     const keycode = KeyConverter.layoutKeyToKeycode(lowerCaseCharacter, layout);
     if (keycode === undefined) {
-      return;
+      continue;
     }
     const oppositeShift = ShiftTracker.isUsingOppositeShift(keycode);