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
@@ -8,19 +8,20 @@
   +onClose: () => void,
   +children?: React.Node,
   +disableTab?: boolean,
+  +disableAutoFocus?: boolean,
 };
 
 function ModalOverlay(props: ModalOverlayProps): React.Node {
-  const { children, onClose, disableTab } = props;
+  const { children, onClose, disableTab, disableAutoFocus } = props;
 
   const overlayRef = React.useRef();
   const firstClickRef = React.useRef(null);
 
   React.useLayoutEffect(() => {
-    if (overlayRef.current) {
+    if (!disableAutoFocus && overlayRef.current) {
       overlayRef.current.focus();
     }
-  }, []);
+  }, [disableAutoFocus]);
 
   const onBackgroundMouseDown = React.useCallback(event => {
     firstClickRef.current = event.target;
diff --git a/web/chat/edit-message-provider.js b/web/chat/edit-message-provider.js
--- a/web/chat/edit-message-provider.js
+++ b/web/chat/edit-message-provider.js
@@ -147,7 +147,11 @@
       return null;
     }
     return (
-      <ModalOverlay onClose={clearEditModal} disableTab={true}>
+      <ModalOverlay
+        onClose={clearEditModal}
+        disableTab={true}
+        disableAutoFocus={true}
+      >
         {modal}
       </ModalOverlay>
     );