diff --git a/shared/src/components/popover/tab/keypress/keypress-tab.component.ts b/shared/src/components/popover/tab/keypress/keypress-tab.component.ts
index e6e2e691..c3cd947d 100644
--- a/shared/src/components/popover/tab/keypress/keypress-tab.component.ts
+++ b/shared/src/components/popover/tab/keypress/keypress-tab.component.ts
@@ -200,7 +200,7 @@ export class KeypressTabComponent extends Tab implements OnChanges {
             const additional = option.additional;
             if (additional && additional.scancode === scancode && additional.type === typeToFind) {
                 return true;
-            } else if (+option.id === scancode) {
+            } else if ((!additional || additional.scancode === undefined) && +option.id === scancode) {
                 return true;
             } else {
                 return false;