diff --git a/lib/hooks/search-sidebars.js b/lib/hooks/search-sidebars.js
--- a/lib/hooks/search-sidebars.js
+++ b/lib/hooks/search-sidebars.js
@@ -23,6 +23,7 @@
   +onChangeSearchText: (
     text: SyntheticEvent<HTMLInputElement> | string,
   ) => mixed,
+  +clearQuery: (event: SyntheticEvent<HTMLAnchorElement>) => void,
 } {
   const [searchState, setSearchState] = React.useState({
     text: '',
@@ -76,6 +77,14 @@
     [searchIndex, setSearchState],
   );
 
+  const clearQuery = React.useCallback(
+    (event: SyntheticEvent<HTMLAnchorElement>) => {
+      event.preventDefault();
+      setSearchState({ text: '', results: new Set() });
+    },
+    [setSearchState],
+  );
+
   React.useEffect(() => {
     setSearchState(curState => ({
       ...curState,
@@ -89,8 +98,9 @@
       searchState,
       setSearchState,
       onChangeSearchText,
+      clearQuery,
     }),
-    [listData, setSearchState, searchState, onChangeSearchText],
+    [listData, setSearchState, searchState, onChangeSearchText, clearQuery],
   );
 }
 
diff --git a/web/modals/chat/sidebar-list-modal.react.js b/web/modals/chat/sidebar-list-modal.react.js
--- a/web/modals/chat/sidebar-list-modal.react.js
+++ b/web/modals/chat/sidebar-list-modal.react.js
@@ -25,8 +25,8 @@
   const {
     listData,
     searchState,
-    setSearchState,
     onChangeSearchText,
+    clearQuery,
   } = useSearchSidebars(threadInfo);
   const { popModal } = useModalContext();
 
@@ -47,14 +47,6 @@
     [popModal, listData],
   );
 
-  const clearQuery = React.useCallback(
-    (event: SyntheticEvent<HTMLAnchorElement>) => {
-      event.preventDefault();
-      setSearchState({ text: '', results: new Set() });
-    },
-    [setSearchState],
-  );
-
   let clearQueryButton = null;
   if (searchState.text) {
     clearQueryButton = (