diff --git a/code/frontend/src/app/shared/directives/numeric-input.directive.ts b/code/frontend/src/app/shared/directives/numeric-input.directive.ts
index add87874..74196abf 100644
--- a/code/frontend/src/app/shared/directives/numeric-input.directive.ts
+++ b/code/frontend/src/app/shared/directives/numeric-input.directive.ts
@@ -36,22 +36,25 @@ export class NumericInputDirective {
 
   @HostListener('keydown', ['$event'])
   onKeyDown(event: KeyboardEvent): void {
-    // Allow: backspace, delete, tab, escape, enter
-    if ([8, 9, 27, 13, 46].indexOf(event.keyCode) !== -1 ||
-        // Allow: Ctrl/Cmd+A,C,V,X
-        (event.keyCode === 65 && (event.ctrlKey === true || event.metaKey === true)) ||
-        (event.keyCode === 67 && (event.ctrlKey === true || event.metaKey === true)) ||
-        (event.keyCode === 86 && (event.ctrlKey === true || event.metaKey === true)) ||
-        (event.keyCode === 88 && (event.ctrlKey === true || event.metaKey === true)) ||
-        // Allow: home, end, left, right
-        (event.keyCode >= 35 && event.keyCode <= 39)) {
+    const allowedKeys = ['Backspace', 'Delete', 'Tab', 'Escape', 'Enter', 'Home', 'End', 'ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
+
+    // Allow navigation and control keys
+    if (allowedKeys.includes(event.key)) {
       return;
     }
-    
-    // Ensure that it is a number and stop the keypress
-    if ((event.shiftKey || (event.keyCode < 48 || event.keyCode > 57)) && (event.keyCode < 96 || event.keyCode > 105)) {
-      event.preventDefault();
+
+    // Allow: Ctrl/Cmd+A,C,V,X
+    if ((event.ctrlKey || event.metaKey) && ['a', 'c', 'v', 'x'].includes(event.key.toLowerCase())) {
+      return;
     }
+
+    // Allow digits (0-9)
+    if (/^[0-9]$/.test(event.key)) {
+      return;
+    }
+
+    // Block all other keys
+    event.preventDefault();
   }
 
   @HostListener('paste', ['$event'])
diff --git a/code/frontend/src/app/shared/directives/signed-numeric-input.directive.ts b/code/frontend/src/app/shared/directives/signed-numeric-input.directive.ts
index 7b598c73..86444ee1 100644
--- a/code/frontend/src/app/shared/directives/signed-numeric-input.directive.ts
+++ b/code/frontend/src/app/shared/directives/signed-numeric-input.directive.ts
@@ -26,20 +26,20 @@ export class SignedNumericInputDirective {
 
   @HostListener('keydown', ['$event'])
   onKeyDown(event: KeyboardEvent): void {
-    // Allow: backspace, delete, tab, escape, enter
-    if ([8, 9, 27, 13, 46].includes(event.keyCode) ||
-        // Allow: Ctrl/Cmd+A,C,V,X
-        (event.keyCode === 65 && (event.ctrlKey || event.metaKey)) ||
-        (event.keyCode === 67 && (event.ctrlKey || event.metaKey)) ||
-        (event.keyCode === 86 && (event.ctrlKey || event.metaKey)) ||
-        (event.keyCode === 88 && (event.ctrlKey || event.metaKey)) ||
-        // Allow: home, end, left, right
-        (event.keyCode >= 35 && event.keyCode <= 39)) {
+    const allowedKeys = ['Backspace', 'Delete', 'Tab', 'Escape', 'Enter', 'Home', 'End', 'ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
+
+    // Allow navigation and control keys
+    if (allowedKeys.includes(event.key)) {
+      return;
+    }
+
+    // Allow: Ctrl/Cmd+A,C,V,X
+    if ((event.ctrlKey || event.metaKey) && ['a', 'c', 'v', 'x'].includes(event.key.toLowerCase())) {
       return;
     }
 
     // Allow minus only at the start and only if not already present
-    if ((event.key === '-' || event.keyCode === 189 || event.keyCode === 109)) {
+    if (event.key === '-') {
       const input = event.target as HTMLInputElement;
       const hasMinus = input.value.includes('-');
       const cursorAtStart = (input.selectionStart ?? 0) === 0;
@@ -50,10 +50,13 @@ export class SignedNumericInputDirective {
       return;
     }
 
-    // Block non-numeric keys
-    if ((event.shiftKey || (event.keyCode < 48 || event.keyCode > 57)) && (event.keyCode < 96 || event.keyCode > 105)) {
-      event.preventDefault();
+    // Allow digits (0-9)
+    if (/^[0-9]$/.test(event.key)) {
+      return;
     }
+
+    // Block all other keys
+    event.preventDefault();
   }
 
   @HostListener('paste', ['$event'])