diff --git a/web/modals/search/message-search-modal.react.js b/web/modals/search/message-search-modal.react.js
--- a/web/modals/search/message-search-modal.react.js
+++ b/web/modals/search/message-search-modal.react.js
@@ -20,17 +20,18 @@
 import Modal from '../modal.react.js';
 
 type ContentProps = {
-  +query: string,
   +threadInfo: ThreadInfo,
 };
 
-function MessageSearchModalContent(props: ContentProps): React.Node {
-  const { query, threadInfo } = props;
+function MessageSearchModal(props: ContentProps): React.Node {
+  const { threadInfo } = props;
 
   const [lastID, setLastID] = React.useState();
   const [searchResults, setSearchResults] = React.useState([]);
   const [endReached, setEndReached] = React.useState(false);
 
+  const { query, setQuery, clearQuery } = useMessageSearchContext();
+
   const appendSearchResults = React.useCallback(
     (newMessages: $ReadOnlyArray<RawMessageInfo>, end: boolean) => {
       setSearchResults(oldMessages => [...oldMessages, ...newMessages]);
@@ -127,33 +128,6 @@
     );
   }, [query, endReached, modifiedItems.length]);
 
-  return (
-    <div className={css.content} ref={messageContainerRef}>
-      {messages}
-      {footer}
-    </div>
-  );
-}
-
-function oldestMessageID(data: $ReadOnlyArray<ChatMessageItem>) {
-  for (let i = data.length - 1; i >= 0; i--) {
-    if (data[i].itemType === 'message' && data[i].messageInfo.id) {
-      return data[i].messageInfo.id;
-    }
-  }
-  return undefined;
-}
-
-type Props = {
-  +threadInfo: ThreadInfo,
-};
-
-function MessageSearchModal(props: Props): React.Node {
-  const { threadInfo } = props;
-  const { popModal } = useModalContext();
-
-  const { query, setQuery, clearQuery } = useMessageSearchContext();
-
   const [input, setInput] = React.useState(query);
 
   const onPressSearch = React.useCallback(
@@ -161,9 +135,6 @@
     [setQuery, input],
   );
 
-  const { uiName } = useResolvedThreadInfo(threadInfo);
-  const searchPlaceholder = `Searching in ${uiName}`;
-
   const onKeyDown = React.useCallback(
     event => {
       if (event.key === 'Enter') {
@@ -173,6 +144,10 @@
     [onPressSearch],
   );
 
+  const { uiName } = useResolvedThreadInfo(threadInfo);
+  const searchPlaceholder = `Searching in ${uiName}`;
+  const { popModal } = useModalContext();
+
   return (
     <Modal name="Search Message" onClose={popModal} size="large">
       <div className={css.container}>
@@ -192,10 +167,22 @@
             Search
           </Button>
         </div>
-        <MessageSearchModalContent threadInfo={threadInfo} query={query} />
+        <div className={css.content} ref={messageContainerRef}>
+          {messages}
+          {footer}
+        </div>
       </div>
     </Modal>
   );
 }
 
+function oldestMessageID(data: $ReadOnlyArray<ChatMessageItem>) {
+  for (let i = data.length - 1; i >= 0; i--) {
+    if (data[i].itemType === 'message' && data[i].messageInfo.id) {
+      return data[i].messageInfo.id;
+    }
+  }
+  return undefined;
+}
+
 export default MessageSearchModal;