diff --git a/src/components/AccordionItemButton.tsx b/src/components/AccordionItemButton.tsx
index 1a7d502..cbe287a 100644
--- a/src/components/AccordionItemButton.tsx
+++ b/src/components/AccordionItemButton.tsx
@@ -22,7 +22,7 @@ const AccordionItemButton = ({
     ...rest
 }: Props) => {
     const handleKeyPress = (evt: React.KeyboardEvent<HTMLDivElement>): void => {
-        const keyCode = evt.which.toString();
+        const keyCode = evt.key;
 
         if (keyCode === keycodes.ENTER || keyCode === keycodes.SPACE) {
             evt.preventDefault();
diff --git a/src/helpers/keycodes.ts b/src/helpers/keycodes.ts
index 8e888e7..56c37b6 100644
--- a/src/helpers/keycodes.ts
+++ b/src/helpers/keycodes.ts
@@ -1,12 +1,12 @@
 const keycodes = {
-    DOWN: '40',
-    END: '35',
-    ENTER: '13',
-    HOME: '36',
-    LEFT: '37',
-    RIGHT: '39',
-    SPACE: '32',
-    UP: '38',
+    DOWN: 'Down',
+    END: 'End',
+    ENTER: 'Enter',
+    HOME: 'Home',
+    LEFT: 'ArrowLeft',
+    RIGHT: 'ArrowRight',
+    SPACE: 'Space',
+    UP: 'ArrowUp'
 };
 
 export default keycodes;