From 9d6fc51ef35c242817a52b6206610abc5fc55503 Mon Sep 17 00:00:00 2001
From: Devin Binnie <devin.binnie@mattermost.com>
Date: Mon, 28 Jul 2025 10:15:26 -0400
Subject: [PATCH] Fix ordering of caret position and selection range

---
 webapp/channels/src/components/new_search/search_box.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/channels/src/components/new_search/search_box.tsx b/webapp/channels/src/components/new_search/search_box.tsx
index 6936a1248bb..5a9e84718e3 100644
--- a/webapp/channels/src/components/new_search/search_box.tsx
+++ b/webapp/channels/src/components/new_search/search_box.tsx
@@ -100,8 +100,8 @@ const SearchBox = forwardRef(
         const addSearchHint = useCallback((newSearchTerms: string) => {
             setSearchTerms(newSearchTerms);
             setTimeout(() => {
-                inputRef.current?.setSelectionRange(newSearchTerms.length, newSearchTerms.length);
                 setCaretPosition(newSearchTerms.length);
+                inputRef.current?.setSelectionRange(newSearchTerms.length, newSearchTerms.length);
             }, 0);
         }, []);