diff --git a/lib/shared/typeahead-utils.js b/lib/shared/typeahead-utils.js
new file mode 100644
index 000000000..33f980ba8
--- /dev/null
+++ b/lib/shared/typeahead-utils.js
@@ -0,0 +1,21 @@
+// @flow
+
+import type { RelativeMemberInfo } from '../types/thread-types';
+import SearchIndex from './search-index';
+import { stringForUserExplicit } from './user-utils';
+
+function getTypeaheadUserSuggestions(
+  userSearchIndex: SearchIndex,
+  usersInThread: $ReadOnlyArray<RelativeMemberInfo>,
+  typedPrefix: string,
+): $ReadOnlyArray<RelativeMemberInfo> {
+  const userIDs = userSearchIndex.getSearchResults(typedPrefix);
+
+  return usersInThread
+    .filter(user => typedPrefix.length === 0 || userIDs.includes(user.id))
+    .sort((userA, userB) =>
+      stringForUserExplicit(userA).localeCompare(stringForUserExplicit(userB)),
+    );
+}
+
+export { getTypeaheadUserSuggestions };
diff --git a/web/chat/typeahead-tooltip.react.js b/web/chat/typeahead-tooltip.react.js
index b3714ed55..73238ac00 100644
--- a/web/chat/typeahead-tooltip.react.js
+++ b/web/chat/typeahead-tooltip.react.js
@@ -1,124 +1,124 @@
 // @flow
 
 import classNames from 'classnames';
 import * as React from 'react';
 
 import SearchIndex from 'lib/shared/search-index';
 import { threadOtherMembers } from 'lib/shared/thread-utils';
+import { getTypeaheadUserSuggestions } from 'lib/shared/typeahead-utils';
 import type { RelativeMemberInfo } from 'lib/types/thread-types';
 
 import Button from '../components/button.react';
 import type { InputState } from '../input/input-state';
 import { type TypeaheadMatchedStrings } from './chat-input-bar.react';
 import css from './typeahead-tooltip.css';
 import {
   getTypeaheadTooltipActions,
   getTypeaheadTooltipPosition,
-  getTypeaheadUserSuggestions,
 } from './typeahead-utils';
 
 export type TypeaheadTooltipProps = {
   +inputState: InputState,
   +textarea: HTMLTextAreaElement,
   +userSearchIndex: SearchIndex,
   +threadMembers: $ReadOnlyArray<RelativeMemberInfo>,
   +viewerID: ?string,
   +matchedStrings: TypeaheadMatchedStrings,
 };
 
 function TypeaheadTooltip(props: TypeaheadTooltipProps): React.Node {
   const {
     inputState,
     textarea,
     userSearchIndex,
     threadMembers,
     viewerID,
     matchedStrings,
   } = props;
   const [isVisible, setIsVisible] = React.useState(false);
 
   React.useEffect(() => {
     setIsVisible(true);
 
     return () => setIsVisible(false);
   }, [setIsVisible]);
 
   const {
     entireText: matchedText,
     textBeforeAtSymbol: matchedTextBeforeAtSymbol,
     usernamePrefix: matchedUsernamePrefix,
   } = matchedStrings;
 
   const typedPrefix = matchedUsernamePrefix ?? '';
 
   const suggestedUsers = React.useMemo(
     () =>
       getTypeaheadUserSuggestions(
         userSearchIndex,
         threadOtherMembers(threadMembers, viewerID),
         typedPrefix,
       ),
     [userSearchIndex, threadMembers, viewerID, typedPrefix],
   );
 
   const actions = React.useMemo(
     () =>
       getTypeaheadTooltipActions(
         inputState,
         textarea,
         suggestedUsers,
         matchedTextBeforeAtSymbol,
         matchedText,
       ),
     [
       inputState,
       textarea,
       suggestedUsers,
       matchedTextBeforeAtSymbol,
       matchedText,
     ],
   );
 
   const tooltipPosition = React.useMemo(
     () =>
       getTypeaheadTooltipPosition(
         textarea,
         actions.length,
         matchedTextBeforeAtSymbol,
       ),
     [textarea, actions.length, matchedTextBeforeAtSymbol],
   );
 
   const tooltipPositionStyle = React.useMemo(
     () => ({
       top: tooltipPosition.top,
       left: tooltipPosition.left,
     }),
     [tooltipPosition],
   );
 
   const tooltipButtons = React.useMemo(() => {
     return actions.map(({ key, onClick, actionButtonContent }) => (
       <Button key={key} onClick={onClick} className={css.suggestion}>
         <span>@{actionButtonContent}</span>
       </Button>
     ));
   }, [actions]);
 
   if (!actions || actions.length === 0) {
     return null;
   }
 
   const overlayClasses = classNames(css.suggestionsContainer, {
     [css.notVisible]: !isVisible,
     [css.visible]: isVisible,
   });
 
   return (
     <div className={overlayClasses} style={tooltipPositionStyle}>
       {tooltipButtons}
     </div>
   );
 }
 
 export default TypeaheadTooltip;
diff --git a/web/chat/typeahead-utils.js b/web/chat/typeahead-utils.js
index 2c3cc246d..85116ab51 100644
--- a/web/chat/typeahead-utils.js
+++ b/web/chat/typeahead-utils.js
@@ -1,159 +1,143 @@
 // @flow
 
 import * as React from 'react';
 
 import { oldValidUsernameRegexString } from 'lib/shared/account-utils';
-import SearchIndex from 'lib/shared/search-index';
 import { stringForUserExplicit } from 'lib/shared/user-utils';
 import type { RelativeMemberInfo } from 'lib/types/thread-types';
 
 const typeaheadRegex: RegExp = new RegExp(
   `(?<textPrefix>(?:^(?:.|\n)*\\s+)|^)@(?<username>${oldValidUsernameRegexString})?$`,
 );
 
 import { type InputState } from '../input/input-state';
 import { typeaheadStyle } from './chat-constants';
 
 export type TypeaheadTooltipAction = {
   +key: string,
   +onClick: (SyntheticEvent<HTMLButtonElement>) => mixed,
   +actionButtonContent: React.Node,
 };
 
 export type TooltipPosition = {
   +top: number,
   +left: number,
 };
 
-function getTypeaheadUserSuggestions(
-  userSearchIndex: SearchIndex,
-  usersInThread: $ReadOnlyArray<RelativeMemberInfo>,
-  typedPrefix: string,
-): $ReadOnlyArray<RelativeMemberInfo> {
-  const userIDs = userSearchIndex.getSearchResults(typedPrefix);
-
-  return usersInThread
-    .filter(user => typedPrefix.length === 0 || userIDs.includes(user.id))
-    .sort((userA, userB) =>
-      stringForUserExplicit(userA).localeCompare(stringForUserExplicit(userB)),
-    );
-}
-
 function getCaretOffsets(
   textarea: HTMLTextAreaElement,
   text: string,
 ): { caretTopOffset: number, caretLeftOffset: number } {
   if (!textarea) {
     return { caretTopOffset: 0, caretLeftOffset: 0 };
   }
 
   // terribly hacky but it works I guess :D
   // we had to use it, as it's hard to count lines in textarea
   // and track cursor position within it as
   // lines can be wrapped into new lines without \n character
   // as result of overflow
   const textareaStyle: CSSStyleDeclaration = window.getComputedStyle(
     textarea,
     null,
   );
   const div = document.createElement('div');
 
   for (const styleName of textareaStyle) {
     div.style.setProperty(styleName, textareaStyle.getPropertyValue(styleName));
   }
 
   div.style.display = 'inline-block';
   div.style.position = 'absolute';
   div.textContent = text;
 
   const span = document.createElement('span');
   span.textContent = textarea.value.slice(text.length);
   div.appendChild(span);
 
   document.body?.appendChild(div);
   const { offsetTop, offsetLeft } = span;
   document.body?.removeChild(div);
 
   const textareaWidth = parseInt(textareaStyle.getPropertyValue('width'));
 
   const caretLeftOffset =
     offsetLeft + typeaheadStyle.tooltipWidth > textareaWidth
       ? textareaWidth - typeaheadStyle.tooltipWidth
       : offsetLeft;
 
   return {
     caretTopOffset: offsetTop - textarea.scrollTop,
     caretLeftOffset,
   };
 }
 
 function getTypeaheadTooltipActions(
   inputState: InputState,
   textarea: HTMLTextAreaElement,
   suggestedUsers: $ReadOnlyArray<RelativeMemberInfo>,
   matchedTextBefore: string,
   matchedText: string,
 ): $ReadOnlyArray<TypeaheadTooltipAction> {
   return suggestedUsers
     .filter(
       suggestedUser => stringForUserExplicit(suggestedUser) !== 'anonymous',
     )
     .map(suggestedUser => ({
       key: suggestedUser.id,
       onClick: () => {
         const newPrefixText = matchedTextBefore;
 
         let newSuffixText = inputState.draft.slice(matchedText.length);
         newSuffixText = (newSuffixText[0] !== ' ' ? ' ' : '') + newSuffixText;
 
         const newText =
           newPrefixText +
           '@' +
           stringForUserExplicit(suggestedUser) +
           newSuffixText;
 
         inputState.setDraft(newText);
         inputState.setTextCursorPosition(
           newText.length - newSuffixText.length + 1,
         );
       },
       actionButtonContent: stringForUserExplicit(suggestedUser),
     }));
 }
 function getTypeaheadTooltipPosition(
   textarea: HTMLTextAreaElement,
   actionsLength: number,
   matchedTextBefore: string,
 ): TooltipPosition {
   const { caretTopOffset, caretLeftOffset } = getCaretOffsets(
     textarea,
     matchedTextBefore,
   );
 
   const textareaBoundingClientRect = textarea.getBoundingClientRect();
 
   const top: number =
     textareaBoundingClientRect.top -
     Math.min(
       typeaheadStyle.tooltipVerticalPadding +
         actionsLength * typeaheadStyle.rowHeight,
       typeaheadStyle.tooltipMaxHeight,
     ) -
     typeaheadStyle.tooltipTopOffset +
     caretTopOffset;
 
   const left: number =
     textareaBoundingClientRect.left -
     typeaheadStyle.tooltipLeftOffset +
     caretLeftOffset;
 
   return { top, left };
 }
 
 export {
   typeaheadRegex,
-  getTypeaheadUserSuggestions,
   getCaretOffsets,
   getTypeaheadTooltipActions,
   getTypeaheadTooltipPosition,
 };