diff --git a/lib/components/modal-overlay.react.js b/lib/components/modal-overlay.react.js
--- a/lib/components/modal-overlay.react.js
+++ b/lib/components/modal-overlay.react.js
@@ -39,7 +39,7 @@
 
   const onKeyDown = React.useCallback(
     event => {
-      if (event.keyCode === 27) {
+      if (event.key === 'Escape') {
         onClose();
       }
     },
diff --git a/web/calendar/entry.react.js b/web/calendar/entry.react.js
--- a/web/calendar/entry.react.js
+++ b/web/calendar/entry.react.js
@@ -270,7 +270,7 @@
   onKeyDown: (
     event: SyntheticKeyboardEvent<HTMLTextAreaElement>,
   ) => void = event => {
-    if (event.keyCode === 27) {
+    if (event.key === 'Escape') {
       invariant(
         this.textarea instanceof HTMLTextAreaElement,
         'textarea ref not set',
diff --git a/web/chat/chat-input-bar.react.js b/web/chat/chat-input-bar.react.js
--- a/web/chat/chat-input-bar.react.js
+++ b/web/chat/chat-input-bar.react.js
@@ -404,7 +404,7 @@
   };
 
   onKeyDown = (event: SyntheticKeyboardEvent<HTMLTextAreaElement>) => {
-    if (event.keyCode === 13 && !event.shiftKey) {
+    if (event.key === 'Enter' && !event.shiftKey) {
       event.preventDefault();
       this.send();
     }
diff --git a/web/media/multimedia-modal.react.js b/web/media/multimedia-modal.react.js
--- a/web/media/multimedia-modal.react.js
+++ b/web/media/multimedia-modal.react.js
@@ -58,7 +58,7 @@
   onKeyDown: (
     event: SyntheticKeyboardEvent<HTMLDivElement>,
   ) => void = event => {
-    if (event.keyCode === 27) {
+    if (event.key === 'Escape') {
       this.props.popModal();
     }
   };
diff --git a/web/modals/threads/color-picker.react.js b/web/modals/threads/color-picker.react.js
--- a/web/modals/threads/color-picker.react.js
+++ b/web/modals/threads/color-picker.react.js
@@ -57,8 +57,7 @@
   onPickerKeyDown: (
     event: SyntheticKeyboardEvent<HTMLTextAreaElement>,
   ) => void = event => {
-    if (event.keyCode === 27) {
-      // Esc
+    if (event.key === 'Escape') {
       this.setState({ pickerOpen: false });
     }
   };