diff --git a/package.json b/package.json
index 69b28e2efb65..a7924af60b08 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "react-compiler-healthcheck": "react-compiler-healthcheck --verbose",
     "react-compiler-healthcheck-test": "react-compiler-healthcheck --verbose &> react-compiler-output.txt",
     "generate-search-parser": "peggy --format es -o src/libs/SearchParser/searchParser.js src/libs/SearchParser/searchParser.peggy src/libs/SearchParser/baseRules.peggy",
-    "generate-autocomplete-parser": "peggy --format es -o src/libs/SearchParser/autocompleteParser.js src/libs/SearchParser/autocompleteParser.peggy src/libs/SearchParser/baseRules.peggy",
+    "generate-autocomplete-parser": "peggy --format es -o src/libs/SearchParser/autocompleteParser.js src/libs/SearchParser/autocompleteParser.peggy src/libs/SearchParser/baseRules.peggy && ./scripts/parser-workletization.sh src/libs/SearchParser/autocompleteParser.js",
     "web:prod": "http-server ./dist --cors"
   },
   "dependencies": {
diff --git a/scripts/parser-workletization.sh b/scripts/parser-workletization.sh
new file mode 100755
index 000000000000..ab048e407de3
--- /dev/null
+++ b/scripts/parser-workletization.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+###
+# This script modifies the autocompleteParser.js file to be compatible with worklets.
+# autocompleteParser.js is generated by PeggyJS and uses some parts of syntax not supported by worklets.
+# This script runs each time the parser is generated by the `generate-autocomplete-parser` command.
+###
+
+filePath=$1
+
+if [ ! -f "$filePath" ]; then
+    echo "$filePath does not exist."
+    exit 1
+fi
+# shellcheck disable=SC2016
+if awk 'BEGIN { print "\47worklet\47\n\nclass peg\$SyntaxError{}" } 1' "$filePath" | sed 's/function peg\$SyntaxError/function temporary/g' | sed 's/peg$subclass(peg$SyntaxError, Error);//g' > tmp.txt; then
+    mv tmp.txt "$filePath"
+    echo "Successfully updated $filePath"
+else
+    echo "An error occurred while modifying the file."
+    rm -f tmp.txt
+    exit 1
+fi
diff --git a/src/components/Search/SearchRouter/SearchRouterInput.tsx b/src/components/Search/SearchAutocompleteInput.tsx
similarity index 75%
rename from src/components/Search/SearchRouter/SearchRouterInput.tsx
rename to src/components/Search/SearchAutocompleteInput.tsx
index 1c4d8204f8b4..ae18442745de 100644
--- a/src/components/Search/SearchRouter/SearchRouterInput.tsx
+++ b/src/components/Search/SearchAutocompleteInput.tsx
@@ -1,20 +1,24 @@
 import type {ForwardedRef, ReactNode, RefObject} from 'react';
 import React, {forwardRef, useState} from 'react';
-import type {StyleProp, TextInputProps, ViewStyle} from 'react-native';
 import {View} from 'react-native';
+import type {StyleProp, TextInputProps, ViewStyle} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import FormHelpMessage from '@components/FormHelpMessage';
 import type {SelectionListHandle} from '@components/SelectionList/types';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {parseForLiveMarkdown} from '@libs/SearchAutocompleteUtils';
 import handleKeyPress from '@libs/SearchInputOnKeyPress';
 import shouldDelayFocus from '@libs/shouldDelayFocus';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 
-type SearchRouterInputProps = {
+type SearchAutocompleteInputProps = {
     /** Value of TextInput */
     value: string;
 
@@ -24,8 +28,8 @@ type SearchRouterInputProps = {
     /** Callback invoked when the user submits the input */
     onSubmit?: () => void;
 
-    /** SearchRouterList ref for managing TextInput and SearchRouterList focus */
-    routerListRef?: RefObject<SelectionListHandle>;
+    /** SearchAutocompleteList ref for managing TextInput and SearchAutocompleteList focus */
+    autocompleteListRef?: RefObject<SelectionListHandle>;
 
     /** Whether the input is full width */
     isFullWidth: boolean;
@@ -56,14 +60,14 @@ type SearchRouterInputProps = {
 
     /** Whether the search reports API call is running  */
     isSearchingForReports?: boolean;
-} & Pick<TextInputProps, 'caretHidden' | 'autoFocus'>;
+} & Pick<TextInputProps, 'caretHidden' | 'autoFocus' | 'selection'>;
 
-function SearchRouterInput(
+function SearchAutocompleteInput(
     {
         value,
         onSearchQueryChange,
         onSubmit = () => {},
-        routerListRef,
+        autocompleteListRef,
         isFullWidth,
         disabled = false,
         shouldShowOfflineMessage = false,
@@ -76,13 +80,19 @@ function SearchRouterInput(
         outerWrapperStyle,
         rightComponent,
         isSearchingForReports,
-    }: SearchRouterInputProps,
+        selection,
+    }: SearchAutocompleteInputProps,
     ref: ForwardedRef<BaseTextInputRef>,
 ) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [isFocused, setIsFocused] = useState<boolean>(false);
     const {isOffline} = useNetwork();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+
+    const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST);
+    const emailList = Object.keys(loginList ?? {});
+
     const offlineMessage: string = isOffline && shouldShowOfflineMessage ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : '';
 
     const inputWidth = isFullWidth ? styles.w100 : {width: variables.popoverWidth};
@@ -95,7 +105,7 @@ function SearchRouterInput(
                     fsClass="fs-unmask"
                 >
                     <TextInput
-                        testID="search-router-text-input"
+                        testID="search-autocomplete-text-input"
                         value={value}
                         onChangeText={onSearchQueryChange}
                         autoFocus={autoFocus}
@@ -113,21 +123,29 @@ function SearchRouterInput(
                         maxLength={CONST.SEARCH_QUERY_LIMIT}
                         onSubmitEditing={onSubmit}
                         shouldUseDisabledStyles={false}
-                        textInputContainerStyles={[styles.borderNone, styles.pb0]}
+                        textInputContainerStyles={[styles.borderNone, styles.pb0, styles.pr3]}
                         inputStyle={[inputWidth, styles.pl3, styles.pr3]}
                         onFocus={() => {
                             setIsFocused(true);
-                            routerListRef?.current?.updateExternalTextInputFocus(true);
+                            autocompleteListRef?.current?.updateExternalTextInputFocus(true);
                             onFocus?.();
                         }}
                         onBlur={() => {
                             setIsFocused(false);
-                            routerListRef?.current?.updateExternalTextInputFocus(false);
+                            autocompleteListRef?.current?.updateExternalTextInputFocus(false);
                             onBlur?.();
                         }}
                         isLoading={!!isSearchingForReports}
                         ref={ref}
                         onKeyPress={handleKeyPress(onSubmit)}
+                        isMarkdownEnabled
+                        multiline={false}
+                        parser={(input: string) => {
+                            'worklet';
+
+                            return parseForLiveMarkdown(input, emailList, currentUserPersonalDetails.displayName ?? '');
+                        }}
+                        selection={selection}
                     />
                 </View>
                 {!!rightComponent && <View style={styles.pr3}>{rightComponent}</View>}
@@ -141,6 +159,7 @@ function SearchRouterInput(
     );
 }
 
-SearchRouterInput.displayName = 'SearchRouterInput';
+SearchAutocompleteInput.displayName = 'SearchAutocompleteInput';
 
-export default forwardRef(SearchRouterInput);
+export type {SearchAutocompleteInputProps};
+export default forwardRef(SearchAutocompleteInput);
diff --git a/src/components/Search/SearchRouter/SearchRouterList.tsx b/src/components/Search/SearchAutocompleteList.tsx
similarity index 98%
rename from src/components/Search/SearchRouter/SearchRouterList.tsx
rename to src/components/Search/SearchAutocompleteList.tsx
index 785708d14ec3..9daf87953b66 100644
--- a/src/components/Search/SearchRouter/SearchRouterList.tsx
+++ b/src/components/Search/SearchAutocompleteList.tsx
@@ -5,7 +5,6 @@ import {useOnyx} from 'react-native-onyx';
 import * as Expensicons from '@components/Icon/Expensicons';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import {useOptionsList} from '@components/OptionListContextProvider';
-import type {SearchFilterKey, UserFriendlyKey} from '@components/Search/types';
 import SelectionList from '@components/SelectionList';
 import SearchQueryListItem, {isSearchQueryItem} from '@components/SelectionList/Search/SearchQueryListItem';
 import type {SearchQueryItem, SearchQueryListItemProps} from '@components/SelectionList/Search/SearchQueryListItem';
@@ -38,7 +37,8 @@ import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type PersonalDetails from '@src/types/onyx/PersonalDetails';
-import {getSubstitutionMapKey} from './getQueryWithSubstitutions';
+import {getSubstitutionMapKey} from './SearchRouter/getQueryWithSubstitutions';
+import type {SearchFilterKey, UserFriendlyKey} from './types';
 
 type AutocompleteItemData = {
     filterKey: UserFriendlyKey;
@@ -49,7 +49,7 @@ type AutocompleteItemData = {
 
 type GetAdditionalSectionsCallback = (options: Options) => Array<SectionListDataType<OptionData | SearchQueryItem>> | undefined;
 
-type SearchRouterListProps = {
+type SearchAutocompleteListProps = {
     /** Value of TextInput */
     autocompleteQueryValue: string;
 
@@ -117,9 +117,8 @@ function SearchRouterItem(props: UserListItemProps<OptionData> | SearchQueryList
     );
 }
 
-// Todo rename to SearchAutocompleteList once it's used in both Router and SearchPage
-function SearchRouterList(
-    {autocompleteQueryValue, searchQueryItem, getAdditionalSections, onListItemPress, setTextQuery, updateAutocompleteSubstitutions}: SearchRouterListProps,
+function SearchAutocompleteList(
+    {autocompleteQueryValue, searchQueryItem, getAdditionalSections, onListItemPress, setTextQuery, updateAutocompleteSubstitutions}: SearchAutocompleteListProps,
     ref: ForwardedRef<SelectionListHandle>,
 ) {
     const styles = useThemeStyles();
@@ -465,7 +464,7 @@ function SearchRouterList(
             }
 
             const trimmedUserSearchQuery = getQueryWithoutAutocompletedPart(autocompleteQueryValue);
-            setTextQuery(`${trimmedUserSearchQuery}${sanitizeSearchValue(focusedItem.searchQuery)} `);
+            setTextQuery(`${trimmedUserSearchQuery}${sanitizeSearchValue(focusedItem.searchQuery)}\u00A0`);
             updateAutocompleteSubstitutions(focusedItem);
         },
         [autocompleteQueryValue, setTextQuery, updateAutocompleteSubstitutions],
@@ -495,6 +494,6 @@ function SearchRouterList(
     );
 }
 
-export default forwardRef(SearchRouterList);
+export default forwardRef(SearchAutocompleteList);
 export {SearchRouterItem};
 export type {GetAdditionalSectionsCallback};
diff --git a/src/components/Search/SearchInputSelectionWrapper/index.native.tsx b/src/components/Search/SearchInputSelectionWrapper/index.native.tsx
new file mode 100644
index 000000000000..534e6f3824a0
--- /dev/null
+++ b/src/components/Search/SearchInputSelectionWrapper/index.native.tsx
@@ -0,0 +1,20 @@
+import type {ForwardedRef} from 'react';
+import React, {forwardRef} from 'react';
+import SearchAutocompleteInput from '@components/Search/SearchAutocompleteInput';
+import type {SearchAutocompleteInputProps} from '@components/Search/SearchAutocompleteInput';
+import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
+
+function SearchInputSelectionWrapper(props: SearchAutocompleteInputProps, ref: ForwardedRef<BaseTextInputRef>) {
+    return (
+        <SearchAutocompleteInput
+            ref={ref}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            selection={undefined}
+        />
+    );
+}
+
+SearchInputSelectionWrapper.displayName = 'SearchInputSelectionWrapper';
+
+export default forwardRef(SearchInputSelectionWrapper);
diff --git a/src/components/Search/SearchInputSelectionWrapper/index.tsx b/src/components/Search/SearchInputSelectionWrapper/index.tsx
new file mode 100644
index 000000000000..0dcf3282b032
--- /dev/null
+++ b/src/components/Search/SearchInputSelectionWrapper/index.tsx
@@ -0,0 +1,20 @@
+import type {ForwardedRef} from 'react';
+import React, {forwardRef} from 'react';
+import SearchAutocompleteInput from '@components/Search/SearchAutocompleteInput';
+import type {SearchAutocompleteInputProps} from '@components/Search/SearchAutocompleteInput';
+import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
+
+function SearchInputSelectionWrapper({selection, ...props}: SearchAutocompleteInputProps, ref: ForwardedRef<BaseTextInputRef>) {
+    return (
+        <SearchAutocompleteInput
+            selection={selection}
+            ref={ref}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        />
+    );
+}
+
+SearchInputSelectionWrapper.displayName = 'SearchInputSelectionWrapper';
+
+export default forwardRef(SearchInputSelectionWrapper);
diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
index a36368293cb2..70398194cc84 100644
--- a/src/components/Search/SearchPageHeader.tsx
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -395,7 +395,7 @@ function SearchPageHeader({queryJSON}: SearchPageHeaderProps) {
                         onTooltipPress={onFiltersButtonPress}
                     >
                         <Button
-                            innerStyles={!isCannedQuery && [styles.searchRouterInputResults, styles.borderNone]}
+                            innerStyles={!isCannedQuery && [styles.searchAutocompleteInputResults, styles.borderNone]}
                             text={translate('search.filtersHeader')}
                             icon={Expensicons.Filters}
                             onPress={onFiltersButtonPress}
diff --git a/src/components/Search/SearchPageHeaderInput.tsx b/src/components/Search/SearchPageHeaderInput.tsx
index 7e1021012bbe..a3e6e0a034fd 100644
--- a/src/components/Search/SearchPageHeaderInput.tsx
+++ b/src/components/Search/SearchPageHeaderInput.tsx
@@ -29,14 +29,14 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
+import SearchAutocompleteList from './SearchAutocompleteList';
+import SearchInputSelectionWrapper from './SearchInputSelectionWrapper';
 import {buildSubstitutionsMap} from './SearchRouter/buildSubstitutionsMap';
 import {getQueryWithSubstitutions} from './SearchRouter/getQueryWithSubstitutions';
 import type {SubstitutionMap} from './SearchRouter/getQueryWithSubstitutions';
 import {getUpdatedSubstitutionsMap} from './SearchRouter/getUpdatedSubstitutionsMap';
 import SearchButton from './SearchRouter/SearchButton';
 import {useSearchRouterContext} from './SearchRouter/SearchRouterContext';
-import SearchRouterInput from './SearchRouter/SearchRouterInput';
-import SearchRouterList from './SearchRouter/SearchRouterList';
 import type {SearchQueryJSON, SearchQueryString} from './types';
 
 // When counting absolute positioning, we need to account for borders
@@ -83,8 +83,9 @@ function SearchPageHeaderInput({queryJSON, children}: SearchPageHeaderInputProps
 
     // The actual input text that the user sees
     const [textInputValue, setTextInputValue] = useState(queryText);
-    // The input text that was last used for autocomplete; needed for the SearchRouterList when browsing list via arrow keys
+    // The input text that was last used for autocomplete; needed for the SearchAutocompleteList when browsing list via arrow keys
     const [autocompleteQueryValue, setAutocompleteQueryValue] = useState(queryText);
+    const [selection, setSelection] = useState({start: textInputValue.length, end: textInputValue.length});
 
     const [autocompleteSubstitutions, setAutocompleteSubstitutions] = useState<SubstitutionMap>({});
     const [isAutocompleteListVisible, setIsAutocompleteListVisible] = useState(false);
@@ -165,7 +166,9 @@ function SearchPageHeaderInput({queryJSON, children}: SearchPageHeaderInputProps
 
                 if (item.searchItemType === CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.AUTOCOMPLETE_SUGGESTION && textInputValue) {
                     const trimmedUserSearchQuery = getQueryWithoutAutocompletedPart(textInputValue);
-                    onSearchQueryChange(`${trimmedUserSearchQuery}${sanitizeSearchValue(item.searchQuery)} `);
+                    const newSearchQuery = `${trimmedUserSearchQuery}${sanitizeSearchValue(item.searchQuery)}\u00A0`;
+                    onSearchQueryChange(newSearchQuery);
+                    setSelection({start: newSearchQuery.length, end: newSearchQuery.length});
 
                     if (item.mapKey && item.autocompleteID) {
                         const substitutions = {...autocompleteSubstitutions, [item.mapKey]: item.autocompleteID};
@@ -196,6 +199,14 @@ function SearchPageHeaderInput({queryJSON, children}: SearchPageHeaderInputProps
         [autocompleteSubstitutions],
     );
 
+    const setTextAndUpdateSelection = useCallback(
+        (text: string) => {
+            setTextInputValue(text);
+            setSelection({start: text.length, end: text.length});
+        },
+        [setSelection, setTextInputValue],
+    );
+
     if (isCannedQuery) {
         const headerIcon = getHeaderContent(type).icon;
 
@@ -258,7 +269,7 @@ function SearchPageHeaderInput({queryJSON, children}: SearchPageHeaderInputProps
             style={[styles.searchResultsHeaderBar, isAutocompleteListVisible && styles.ph3]}
         >
             <View style={[styles.appBG, ...autocompleteInputStyle]}>
-                <SearchRouterInput
+                <SearchInputSelectionWrapper
                     value={textInputValue}
                     onSearchQueryChange={onSearchQueryChange}
                     isFullWidth
@@ -272,19 +283,20 @@ function SearchPageHeaderInput({queryJSON, children}: SearchPageHeaderInputProps
                     autoFocus={false}
                     onFocus={showAutocompleteList}
                     onBlur={hideAutocompleteList}
-                    wrapperStyle={[styles.searchRouterInputResults, styles.br2]}
-                    wrapperFocusedStyle={styles.searchRouterInputResultsFocused}
+                    wrapperStyle={[styles.searchAutocompleteInputResults, styles.br2]}
+                    wrapperFocusedStyle={styles.searchAutocompleteInputResultsFocused}
                     outerWrapperStyle={[inputWrapperActiveStyle, styles.pb2]}
                     rightComponent={children}
-                    routerListRef={listRef}
+                    autocompleteListRef={listRef}
                     ref={textInputRef}
+                    selection={selection}
                 />
                 <View style={[styles.mh85vh, !isAutocompleteListVisible && styles.dNone]}>
-                    <SearchRouterList
+                    <SearchAutocompleteList
                         autocompleteQueryValue={autocompleteQueryValue}
                         searchQueryItem={searchQueryItem}
                         onListItemPress={onListItemPress}
-                        setTextQuery={setTextInputValue}
+                        setTextQuery={setTextAndUpdateSelection}
                         updateAutocompleteSubstitutions={updateAutocompleteSubstitutions}
                         ref={listRef}
                     />
diff --git a/src/components/Search/SearchRouter/SearchRouter.tsx b/src/components/Search/SearchRouter/SearchRouter.tsx
index 6e28dabc8d4a..b305f038b564 100644
--- a/src/components/Search/SearchRouter/SearchRouter.tsx
+++ b/src/components/Search/SearchRouter/SearchRouter.tsx
@@ -7,6 +7,9 @@ import type {ValueOf} from 'type-fest';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import type {AnimatedTextInputRef} from '@components/RNTextInput';
+import SearchAutocompleteList from '@components/Search/SearchAutocompleteList';
+import type {GetAdditionalSectionsCallback} from '@components/Search/SearchAutocompleteList';
+import SearchInputSelectionWrapper from '@components/Search/SearchInputSelectionWrapper';
 import type {SearchQueryString} from '@components/Search/types';
 import {isSearchQueryItem} from '@components/SelectionList/Search/SearchQueryListItem';
 import type {SearchQueryItem} from '@components/SelectionList/Search/SearchQueryListItem';
@@ -17,14 +20,14 @@ import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as InputUtils from '@libs/InputUtils';
+import {scrollToRight} from '@libs/InputUtils';
 import type {SearchOption} from '@libs/OptionsListUtils';
 import type {OptionData} from '@libs/ReportUtils';
-import * as SearchAutocompleteUtils from '@libs/SearchAutocompleteUtils';
-import * as SearchQueryUtils from '@libs/SearchQueryUtils';
+import {getAutocompleteQueryWithComma, getQueryWithoutAutocompletedPart} from '@libs/SearchAutocompleteUtils';
+import {getQueryWithUpdatedValues, sanitizeSearchValue} from '@libs/SearchQueryUtils';
 import Navigation from '@navigation/Navigation';
 import variables from '@styles/variables';
-import * as ReportUserActions from '@userActions/Report';
+import {navigateToAndOpenReport} from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -33,9 +36,6 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import {getQueryWithSubstitutions} from './getQueryWithSubstitutions';
 import type {SubstitutionMap} from './getQueryWithSubstitutions';
 import {getUpdatedSubstitutionsMap} from './getUpdatedSubstitutionsMap';
-import SearchRouterInput from './SearchRouterInput';
-import type {GetAdditionalSectionsCallback} from './SearchRouterList';
-import SearchRouterList from './SearchRouterList';
 
 function getContextualSearchAutocompleteKey(item: SearchQueryItem) {
     if (item.roomType === CONST.SEARCH.DATA_TYPES.INVOICE) {
@@ -55,12 +55,12 @@ function getContextualSearchQuery(item: SearchQueryItem) {
         case CONST.SEARCH.DATA_TYPES.INVOICE:
             additionalQuery += ` ${CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.POLICY_ID}:${item.policyID}`;
             if (item.roomType === CONST.SEARCH.DATA_TYPES.INVOICE && item.autocompleteID) {
-                additionalQuery += ` ${CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.TO}:${SearchQueryUtils.sanitizeSearchValue(item.searchQuery ?? '')}`;
+                additionalQuery += ` ${CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.TO}:${sanitizeSearchValue(item.searchQuery ?? '')}`;
             }
             break;
         case CONST.SEARCH.DATA_TYPES.CHAT:
         default:
-            additionalQuery = ` ${CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.IN}:${SearchQueryUtils.sanitizeSearchValue(item.searchQuery ?? '')}`;
+            additionalQuery = ` ${CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS.IN}:${sanitizeSearchValue(item.searchQuery ?? '')}`;
             break;
     }
     return baseQuery + additionalQuery;
@@ -83,8 +83,9 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
 
     // The actual input text that the user sees
     const [textInputValue, , setTextInputValue] = useDebouncedState('', 500);
-    // The input text that was last used for autocomplete; needed for the SearchRouterList when browsing list via arrow keys
+    // The input text that was last used for autocomplete; needed for the SearchAutocompleteList when browsing list via arrow keys
     const [autocompleteQueryValue, setAutocompleteQueryValue] = useState(textInputValue);
+    const [selection, setSelection] = useState({start: textInputValue.length, end: textInputValue.length});
     const [autocompleteSubstitutions, setAutocompleteSubstitutions] = useState<SubstitutionMap>({});
     const textInputRef = useRef<AnimatedTextInputRef>(null);
 
@@ -170,7 +171,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
             return;
         }
 
-        InputUtils.scrollToRight(textInputRef.current);
+        scrollToRight(textInputRef.current);
         shouldScrollRef.current = false;
     }, []);
 
@@ -179,7 +180,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
             if (autoScrollToRight) {
                 shouldScrollRef.current = true;
             }
-            const updatedUserQuery = SearchAutocompleteUtils.getAutocompleteQueryWithComma(textInputValue, userQuery);
+            const updatedUserQuery = getAutocompleteQueryWithComma(textInputValue, userQuery);
             setTextInputValue(updatedUserQuery);
             setAutocompleteQueryValue(updatedUserQuery);
 
@@ -198,7 +199,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
     const submitSearch = useCallback(
         (queryString: SearchQueryString) => {
             const queryWithSubstitutions = getQueryWithSubstitutions(queryString, autocompleteSubstitutions);
-            const updatedQuery = SearchQueryUtils.getQueryWithUpdatedValues(queryWithSubstitutions, activeWorkspaceID);
+            const updatedQuery = getQueryWithUpdatedValues(queryWithSubstitutions, activeWorkspaceID);
             if (!updatedQuery) {
                 return;
             }
@@ -212,6 +213,14 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
         [autocompleteSubstitutions, onRouterClose, setTextInputValue, activeWorkspaceID],
     );
 
+    const setTextAndUpdateSelection = useCallback(
+        (text: string) => {
+            setTextInputValue(text);
+            setSelection({start: text.length, end: text.length});
+        },
+        [setSelection, setTextInputValue],
+    );
+
     const onListItemPress = useCallback(
         (item: OptionData | SearchQueryItem) => {
             if (isSearchQueryItem(item)) {
@@ -221,7 +230,9 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
 
                 if (item.searchItemType === CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.CONTEXTUAL_SUGGESTION) {
                     const searchQuery = getContextualSearchQuery(item);
-                    onSearchQueryChange(`${searchQuery} `, true);
+                    const newSearchQuery = `${searchQuery}\u00A0`;
+                    onSearchQueryChange(newSearchQuery, true);
+                    setSelection({start: newSearchQuery.length, end: newSearchQuery.length});
 
                     const autocompleteKey = getContextualSearchAutocompleteKey(item);
                     if (autocompleteKey && item.autocompleteID) {
@@ -230,8 +241,10 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
                         setAutocompleteSubstitutions(substitutions);
                     }
                 } else if (item.searchItemType === CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.AUTOCOMPLETE_SUGGESTION && textInputValue) {
-                    const trimmedUserSearchQuery = SearchAutocompleteUtils.getQueryWithoutAutocompletedPart(textInputValue);
-                    onSearchQueryChange(`${trimmedUserSearchQuery}${SearchQueryUtils.sanitizeSearchValue(item.searchQuery)} `);
+                    const trimmedUserSearchQuery = getQueryWithoutAutocompletedPart(textInputValue);
+                    const newSearchQuery = `${trimmedUserSearchQuery}${sanitizeSearchValue(item.searchQuery)}\u00A0`;
+                    onSearchQueryChange(newSearchQuery);
+                    setSelection({start: newSearchQuery.length, end: newSearchQuery.length});
 
                     if (item.mapKey && item.autocompleteID) {
                         const substitutions = {...autocompleteSubstitutions, [item.mapKey]: item.autocompleteID};
@@ -249,7 +262,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
                 if (item?.reportID) {
                     Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(item?.reportID));
                 } else if ('login' in item) {
-                    ReportUserActions.navigateToAndOpenReport(item.login ? [item.login] : [], false);
+                    navigateToAndOpenReport(item.login ? [item.login] : [], false);
                 }
             }
         },
@@ -288,7 +301,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
             )}
             {isRecentSearchesDataLoaded && (
                 <>
-                    <SearchRouterInput
+                    <SearchInputSelectionWrapper
                         value={textInputValue}
                         isFullWidth={shouldUseNarrowLayout}
                         onSearchQueryChange={onSearchQueryChange}
@@ -303,20 +316,21 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps)
                             onListItemPress(focusedOption);
                         }}
                         caretHidden={shouldHideInputCaret}
-                        routerListRef={listRef}
+                        autocompleteListRef={listRef}
                         shouldShowOfflineMessage
                         wrapperStyle={[styles.border, styles.alignItemsCenter]}
                         outerWrapperStyle={[shouldUseNarrowLayout ? styles.mv3 : styles.mv2, shouldUseNarrowLayout ? styles.mh5 : styles.mh2]}
                         wrapperFocusedStyle={[styles.borderColorFocus]}
                         isSearchingForReports={isSearchingForReports}
+                        selection={selection}
                         ref={textInputRef}
                     />
-                    <SearchRouterList
+                    <SearchAutocompleteList
                         autocompleteQueryValue={autocompleteQueryValue || textInputValue}
                         searchQueryItem={searchQueryItem}
                         getAdditionalSections={getAdditionalSections}
                         onListItemPress={onListItemPress}
-                        setTextQuery={setTextInputValue}
+                        setTextQuery={setTextAndUpdateSelection}
                         updateAutocompleteSubstitutions={updateAutocompleteSubstitutions}
                         ref={listRef}
                     />
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index 2eb5a5f7f134..9f39de02f334 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -13,7 +13,7 @@ import type {
     ViewStyle,
 } from 'react-native';
 import type {AnimatedStyle} from 'react-native-reanimated';
-import type {SearchRouterItem} from '@components/Search/SearchRouter/SearchRouterList';
+import type {SearchRouterItem} from '@components/Search/SearchAutocompleteList';
 import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 // eslint-disable-next-line no-restricted-imports
 import type CursorStyles from '@styles/utils/cursor/types';
diff --git a/src/components/TextInput/BaseTextInput/types.ts b/src/components/TextInput/BaseTextInput/types.ts
index eef2d471a0d7..af4631604579 100644
--- a/src/components/TextInput/BaseTextInput/types.ts
+++ b/src/components/TextInput/BaseTextInput/types.ts
@@ -1,4 +1,4 @@
-import type {MarkdownStyle} from '@expensify/react-native-live-markdown';
+import type {MarkdownRange, MarkdownStyle} from '@expensify/react-native-live-markdown';
 import type {GestureResponderEvent, StyleProp, TextInputProps, TextStyle, ViewStyle} from 'react-native';
 import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import type IconAsset from '@src/types/utils/IconAsset';
@@ -122,6 +122,9 @@ type CustomBaseTextInputProps = {
     /** List of markdowns that won't be styled as a markdown */
     excludedMarkdownStyles?: Array<keyof MarkdownStyle>;
 
+    /** Custom parser function for RNMarkdownTextInput */
+    parser?: (input: string) => MarkdownRange[];
+
     /** Whether the clear button should be displayed */
     shouldShowClearButton?: boolean;
 
diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts
index fe6988033dd9..2aece1753758 100644
--- a/src/libs/SearchAutocompleteUtils.ts
+++ b/src/libs/SearchAutocompleteUtils.ts
@@ -1,9 +1,11 @@
+import type {MarkdownRange} from '@expensify/react-native-live-markdown';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {SearchAutocompleteResult} from '@components/Search/types';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, PolicyCategories, PolicyTagLists, RecentlyUsedCategories, RecentlyUsedTags} from '@src/types/onyx';
 import {getTagNamesFromTagsLists} from './PolicyUtils';
-import * as autocompleteParser from './SearchParser/autocompleteParser';
+import {parse} from './SearchParser/autocompleteParser';
 
 /**
  * Parses given query using the autocomplete parser.
@@ -11,10 +13,10 @@ import * as autocompleteParser from './SearchParser/autocompleteParser';
  */
 function parseForAutocomplete(text: string) {
     try {
-        const parsedAutocomplete = autocompleteParser.parse(text) as SearchAutocompleteResult;
+        const parsedAutocomplete = parse(text) as SearchAutocompleteResult;
         return parsedAutocomplete;
     } catch (e) {
-        console.error(`Error when parsing autocopmlete query"`, e);
+        console.error(`Error when parsing autocomplete query"`, e);
     }
 }
 
@@ -131,6 +133,28 @@ function getAutocompleteQueryWithComma(prevQuery: string, newQuery: string) {
     return newQuery;
 }
 
+/**
+ * Parses input string using the autocomplete parser and returns array of
+ * markdown ranges that can be used by RNMarkdownTextInput.
+ * It is simpler version of search parser that can be run on UI.
+ */
+function parseForLiveMarkdown(input: string, userLogins: string[], userDisplayName: string) {
+    'worklet';
+
+    const parsedAutocomplete = parse(input) as SearchAutocompleteResult;
+    const ranges = parsedAutocomplete.ranges;
+
+    return ranges.map((range) => {
+        let type = 'mention-user';
+
+        if ((range.key === CONST.SEARCH.SYNTAX_FILTER_KEYS.TO || CONST.SEARCH.SYNTAX_FILTER_KEYS.FROM) && (userLogins.includes(range.value) || range.value === userDisplayName)) {
+            type = 'mention-here';
+        }
+
+        return {...range, type};
+    }) as MarkdownRange[];
+}
+
 export {
     parseForAutocomplete,
     getAutocompleteTags,
@@ -140,4 +164,5 @@ export {
     getAutocompleteTaxList,
     getQueryWithoutAutocompletedPart,
     getAutocompleteQueryWithComma,
+    parseForLiveMarkdown,
 };
diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index d8705428bc1f..f4ebc66f828e 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -1,15 +1,23 @@
+'worklet'
+
+class peg$SyntaxError{}
 // @generated by Peggy 4.0.3.
 //
 // https://peggyjs.org/
 
 
+// CAUTION: DO NOT DIRECTLY ALTER OR MODIFY `searchParser.js` OR `autocompleteParser.js`
+// These files are auto-generated by Peggy from grammar files (*.peggy). 
+// To make changes, edit the corresponding *.peggy files only.
+// Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
+
 function peg$subclass(child, parent) {
   function C() { this.constructor = child; }
   C.prototype = parent.prototype;
   child.prototype = new C();
 }
 
-function peg$SyntaxError(message, expected, found, location) {
+function temporary(message, expected, found, location) {
   var self = Error.call(this, message);
   // istanbul ignore next Check is a necessary evil to support older environments
   if (Object.setPrototypeOf) {
@@ -22,7 +30,7 @@ function peg$SyntaxError(message, expected, found, location) {
   return self;
 }
 
-peg$subclass(peg$SyntaxError, Error);
+
 
 function peg$padEnd(str, targetLength, padString) {
   padString = padString || " ";
@@ -214,11 +222,11 @@ function peg$parse(input, options) {
   var peg$c36 = "<";
 
   var peg$r0 = /^[:=]/;
-  var peg$r1 = /^[^ ,"\u201D\u201C\t\n\r]/;
+  var peg$r1 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
   var peg$r2 = /^["\u201C-\u201D]/;
   var peg$r3 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r4 = /^[^ ,\t\n\r]/;
-  var peg$r5 = /^[ \t\r\n]/;
+  var peg$r4 = /^[^ ,\t\n\r\xA0]/;
+  var peg$r5 = /^[ \t\r\n\xA0]/;
 
   var peg$e0 = peg$literalExpectation(",", false);
   var peg$e1 = peg$otherExpectation("key");
@@ -261,13 +269,13 @@ function peg$parse(input, options) {
   var peg$e38 = peg$literalExpectation("<=", false);
   var peg$e39 = peg$literalExpectation("<", false);
   var peg$e40 = peg$otherExpectation("quote");
-  var peg$e41 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r"], true, false);
+  var peg$e41 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
   var peg$e42 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
   var peg$e43 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e44 = peg$classExpectation([" ", ",", "\t", "\n", "\r"], true, false);
+  var peg$e44 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
   var peg$e45 = peg$otherExpectation("word");
   var peg$e46 = peg$otherExpectation("whitespace");
-  var peg$e47 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
+  var peg$e47 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
 
   var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
   var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
@@ -348,7 +356,7 @@ function peg$parse(input, options) {
   var peg$f33 = function() { return "gt"; };
   var peg$f34 = function() { return "lte"; };
   var peg$f35 = function() { return "lt"; };
-  var peg$f36 = function(start, inner, end) {
+  var peg$f36 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
   var peg$f37 = function(chars) { return chars.join("").trim(); };
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index 928d1751f8ce..54af9dcf9e81 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -12,6 +12,11 @@
 //
 // filter, logicalAnd, operator, alphanumeric, quotedString are defined in baseRules.peggy grammar.
 //
+{{// CAUTION: DO NOT DIRECTLY ALTER OR MODIFY `searchParser.js` OR `autocompleteParser.js`
+// These files are auto-generated by Peggy from grammar files (*.peggy). 
+// To make changes, edit the corresponding *.peggy files only.
+// Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
+}}
 // per-parser initializer (code executed before every parse).
 { let autocomplete = null; }
 
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index ebde336a6ead..56e7cbf46015 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -56,12 +56,12 @@ operator "operator"
   / "<" { return "lt"; }
 
 quotedString "quote"
-  = start:[^ ,"”“\t\n\r]* ("“" / "\"" / "”") inner:[^"”“\r\n]* ("“" / "\"" / "”") end:[^ ,\t\n\r]* {
+  = start:[^ ,"”“\t\n\r\xA0]* ("“" / "\"" / "”") inner:[^"”“\r\n]* ("“" / "\"" / "”") end:[^ ,\t\n\r\xA0]* { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     }
 
-alphanumeric "word" = chars:[^ ,\t\n\r]+ { return chars.join("").trim(); }
+alphanumeric "word" = chars:[^ ,\t\n\r\xA0]+ { return chars.join("").trim(); } //handle no-breaking space
 
 logicalAnd = _ { return "and"; }
 
-_ "whitespace" = [ \t\r\n]*
+_ "whitespace" = [ \t\r\n\xA0]* //handle no-breaking space
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index d9baeadb2a14..463fe85566a6 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -3,6 +3,10 @@
 // https://peggyjs.org/
 
 
+// CAUTION: DO NOT DIRECTLY ALTER OR MODIFY `searchParser.js` OR `autocompleteParser.js`
+// These files are auto-generated by Peggy from grammar files (*.peggy). 
+// To make changes, edit the corresponding *.peggy files only.
+// Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
 
   function buildFilter(operator, left, right) {
     return { operator, left, right };
@@ -220,11 +224,11 @@ function peg$parse(input, options) {
 
   var peg$r0 = /^[^ \t\r\n]/;
   var peg$r1 = /^[:=]/;
-  var peg$r2 = /^[^ ,"\u201D\u201C\t\n\r]/;
+  var peg$r2 = /^[^ ,"\u201D\u201C\t\n\r\xA0]/;
   var peg$r3 = /^["\u201C-\u201D]/;
   var peg$r4 = /^[^"\u201D\u201C\r\n]/;
-  var peg$r5 = /^[^ ,\t\n\r]/;
-  var peg$r6 = /^[ \t\r\n]/;
+  var peg$r5 = /^[^ ,\t\n\r\xA0]/;
+  var peg$r6 = /^[ \t\r\n\xA0]/;
 
   var peg$e0 = peg$classExpectation([" ", "\t", "\r", "\n"], true, false);
   var peg$e1 = peg$otherExpectation("key");
@@ -269,13 +273,13 @@ function peg$parse(input, options) {
   var peg$e40 = peg$literalExpectation("<=", false);
   var peg$e41 = peg$literalExpectation("<", false);
   var peg$e42 = peg$otherExpectation("quote");
-  var peg$e43 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r"], true, false);
+  var peg$e43 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
   var peg$e44 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
   var peg$e45 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e46 = peg$classExpectation([" ", ",", "\t", "\n", "\r"], true, false);
+  var peg$e46 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
   var peg$e47 = peg$otherExpectation("word");
   var peg$e48 = peg$otherExpectation("whitespace");
-  var peg$e49 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
+  var peg$e49 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
@@ -362,7 +366,7 @@ function peg$parse(input, options) {
   var peg$f34 = function() { return "gt"; };
   var peg$f35 = function() { return "lte"; };
   var peg$f36 = function() { return "lt"; };
-  var peg$f37 = function(start, inner, end) {
+  var peg$f37 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
   var peg$f38 = function(chars) { return chars.join("").trim(); };
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index f0f67d4bb729..b379f22b59e1 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -16,7 +16,11 @@
 // filter, logicalAnd, operator, alphanumeric, quotedStrig are defined in baseRules.peggy grammar
 
 // global initializer (code executed only once)
-{{
+{{// CAUTION: DO NOT DIRECTLY ALTER OR MODIFY `searchParser.js` OR `autocompleteParser.js`
+// These files are auto-generated by Peggy from grammar files (*.peggy). 
+// To make changes, edit the corresponding *.peggy files only.
+// Use the `generate-search-parser` and `generate-autocomplete-parser` scripts to regenerate parsers after modifications.
+
   function buildFilter(operator, left, right) {
     return { operator, left, right };
   }
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 3bbc08a5a532..d110929ff8bf 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -67,10 +67,10 @@ const UserFriendlyKeyMap: Record<SearchFilterKey | typeof CONST.SEARCH.SYNTAX_RO
 
 /**
  * @private
- * Returns string value wrapped in quotes "", if the value contains space.
+ * Returns string value wrapped in quotes "", if the value contains space or &nbsp; (no-breaking space).
  */
 function sanitizeSearchValue(str: string) {
-    if (str.includes(' ')) {
+    if (str.includes(' ') || str.includes(`\xA0`)) {
         return `"${str}"`;
     }
     return str;
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 0feb30602edc..85e0f45c5466 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -3685,13 +3685,13 @@ const styles = (theme: ThemeColors) =>
             paddingHorizontal: 8,
         },
 
-        searchRouterInputResults: {
+        searchAutocompleteInputResults: {
             backgroundColor: theme.sidebarHover,
             borderWidth: 1,
             borderColor: theme.sidebarHover,
         },
 
-        searchRouterInputResultsFocused: {
+        searchAutocompleteInputResultsFocused: {
             borderWidth: 1,
             borderColor: theme.success,
             backgroundColor: theme.appBG,
diff --git a/tests/perf-test/SearchRouter.perf-test.tsx b/tests/perf-test/SearchRouter.perf-test.tsx
index 747e78b2a9ee..089f08b14fb3 100644
--- a/tests/perf-test/SearchRouter.perf-test.tsx
+++ b/tests/perf-test/SearchRouter.perf-test.tsx
@@ -5,8 +5,8 @@ import Onyx from 'react-native-onyx';
 import {measureRenders} from 'reassure';
 import {LocaleContextProvider} from '@components/LocaleContextProvider';
 import {OptionsListContext} from '@components/OptionListContextProvider';
+import SearchAutocompleteInput from '@components/Search/SearchAutocompleteInput';
 import SearchRouter from '@components/Search/SearchRouter/SearchRouter';
-import SearchRouterInput from '@components/Search/SearchRouter/SearchRouterInput';
 import {createOptionList} from '@libs/OptionsListUtils';
 import ComposeProviders from '@src/components/ComposeProviders';
 import OnyxProvider from '@src/components/OnyxProvider';
@@ -109,11 +109,11 @@ afterEach(() => {
 
 const mockOnClose = jest.fn();
 
-function SearchRouterInputWrapper() {
+function SearchAutocompleteInputWrapper() {
     const [value, setValue] = React.useState('');
     return (
         <ComposeProviders components={[OnyxProvider, LocaleContextProvider]}>
-            <SearchRouterInput
+            <SearchAutocompleteInput
                 value={value}
                 onSearchQueryChange={(searchTerm) => setValue(searchTerm)}
                 isFullWidth={false}
@@ -151,7 +151,7 @@ test('[SearchRouter] should render list with cached options', async () => {
 
 test('[SearchRouter] should react to text input changes', async () => {
     const scenario = async () => {
-        const input = await screen.findByTestId('search-router-text-input');
+        const input = await screen.findByTestId('search-autocomplete-text-input');
         fireEvent.changeText(input, 'Email Four');
         fireEvent.changeText(input, 'Report');
         fireEvent.changeText(input, 'Email Five');
@@ -166,5 +166,5 @@ test('[SearchRouter] should react to text input changes', async () => {
                 [ONYXKEYS.IS_SEARCHING_FOR_REPORTS]: true,
             }),
         )
-        .then(() => measureRenders(<SearchRouterInputWrapper />, {scenario}));
+        .then(() => measureRenders(<SearchAutocompleteInputWrapper />, {scenario}));
 });