diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index 32aa1e9ed..d2ff5b89c 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -63,7 +63,7 @@
         class="modal-curtain"
         data-curtain
         on:click={handleBLur}
-        on:keyup={clickOnEnter}
+        on:keyup|self={clickOnEnter}
         transition:fade={transitionFade}>
         <section
             class:is-small={size === 'small'}
diff --git a/src/lib/components/step.svelte b/src/lib/components/step.svelte
index 7c67654c2..3caa09654 100644
--- a/src/lib/components/step.svelte
+++ b/src/lib/components/step.svelte
@@ -12,7 +12,7 @@
 
 <li
     on:click|preventDefault
-    on:keyup={clickOnEnter}
+    on:keyup|self={clickOnEnter}
     class:steps-item={!isSub}
     class:steps-sub-item={isSub}
     style={`cursor: ${completed ? 'pointer' : 'default'};`}
diff --git a/src/lib/helpers/a11y.ts b/src/lib/helpers/a11y.ts
index 4ed15e0c9..2b142dea6 100644
--- a/src/lib/helpers/a11y.ts
+++ b/src/lib/helpers/a11y.ts
@@ -1,9 +1,9 @@
 export function clickOnEnter(
     event: KeyboardEvent & {
-        currentTarget: HTMLElement;
+        currentTarget: EventTarget & HTMLElement;
     }
 ) {
-    if (event.key === 'Enter' && event.target === event.currentTarget) {
+    if (event.key === 'Enter' && event.currentTarget.contains(event.target as Node)) {
         event.preventDefault();
         event.currentTarget.click();
     }
diff --git a/src/routes/console/project-[project]/authentication/security/+page.svelte b/src/routes/console/project-[project]/authentication/security/+page.svelte
index b7214fe74..317d800e3 100644
--- a/src/routes/console/project-[project]/authentication/security/+page.svelte
+++ b/src/routes/console/project-[project]/authentication/security/+page.svelte
@@ -115,7 +115,7 @@
                     <div
                         class="input-text-wrapper u-stretch"
                         on:click={() => (isLimited = 'limited')}
-                        on:keyup={clickOnEnter}>
+                        on:keyup|self={clickOnEnter}>
                         <input
                             type="number"
                             name="limit"