diff --git a/.changeset/shaggy-chairs-explode.md b/.changeset/shaggy-chairs-explode.md
new file mode 100644
index 00000000000..f93b7c5ebf9
--- /dev/null
+++ b/.changeset/shaggy-chairs-explode.md
@@ -0,0 +1,5 @@
+---
+'@graphiql/react': patch
+---
+
+replace rest of `event.keyCode` usages by `event.code`
diff --git a/packages/graphiql-react/src/editor/header-editor.ts b/packages/graphiql-react/src/editor/header-editor.ts
index 19e8727c316..db700f56fea 100644
--- a/packages/graphiql-react/src/editor/header-editor.ts
+++ b/packages/graphiql-react/src/editor/header-editor.ts
@@ -96,10 +96,10 @@ export function useHeaderEditor(
       });
 
       newEditor.on('keyup', (editorInstance, event) => {
-        const { keyCode, key, shiftKey } = event;
-        const isLetter = keyCode >= 65 && keyCode <= 90;
-        const isNumber = keyCode >= 48 && keyCode <= 57;
-        if (isLetter || (!shiftKey && isNumber) || key === '_' || key === '"') {
+        const { code, key, shiftKey } = event;
+        const isLetter = code.startsWith('Key');
+        const isNumber = !shiftKey && code.startsWith('Digit');
+        if (isLetter || isNumber || key === '_' || key === '"') {
           editorInstance.execCommand('autocomplete');
         }
       });
diff --git a/packages/graphiql-react/src/editor/variable-editor.ts b/packages/graphiql-react/src/editor/variable-editor.ts
index d3c54ac995b..2213c383e27 100644
--- a/packages/graphiql-react/src/editor/variable-editor.ts
+++ b/packages/graphiql-react/src/editor/variable-editor.ts
@@ -116,10 +116,10 @@ export function useVariableEditor(
       });
 
       newEditor.on('keyup', (editorInstance, event) => {
-        const { keyCode, key, shiftKey } = event;
-        const isLetter = keyCode >= 65 && keyCode <= 90;
-        const isNumber = keyCode >= 48 && keyCode <= 57;
-        if (isLetter || (!shiftKey && isNumber) || key === '_' || key === '"') {
+        const { code, key, shiftKey } = event;
+        const isLetter = code.startsWith('Key');
+        const isNumber = !shiftKey && code.startsWith('Digit');
+        if (isLetter || isNumber || key === '_' || key === '"') {
           editorInstance.execCommand('autocomplete');
         }
       });