diff --git a/client/src/templates/Challenges/components/hotkeys.tsx b/client/src/templates/Challenges/components/hotkeys.tsx
index 5efa8444d94..aba3b7217aa 100644
--- a/client/src/templates/Challenges/components/hotkeys.tsx
+++ b/client/src/templates/Challenges/components/hotkeys.tsx
@@ -224,6 +224,7 @@ function Hotkeys({
     <>
       <HotKeys
         id='editor-layout'
+        data-playwright-test-label='hotkeys'
         allowChanges={true}
         handlers={handlers}
         innerRef={containerRef}
diff --git a/e2e/shortcuts-modal.spec.ts b/e2e/shortcuts-modal.spec.ts
index 8e27ad025ab..34498b5912b 100644
--- a/e2e/shortcuts-modal.spec.ts
+++ b/e2e/shortcuts-modal.spec.ts
@@ -28,6 +28,7 @@ const openModal = async (page: Page) => {
   // The editor pane is focused by default, so we need to escape or it will
   // capture the keyboard shortcuts
   await getEditors(page).press('Escape');
+  await expect(page.getByTestId('hotkeys')).toBeFocused();
   await page.keyboard.press('Shift+?');
 };