diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx
index 0ad1d8fe46..028c521e0f 100644
--- a/src/view/screens/Search/Search.tsx
+++ b/src/view/screens/Search/Search.tsx
@@ -580,13 +580,13 @@ export function SearchScreen(
 
   const onSubmit = React.useCallback(() => {
     scrollToTopWeb()
+    setShowAutocomplete(false)
     updateSearchHistory(searchText)
 
     if (isWeb) {
       navigation.push('Search', {q: searchText})
     } else {
       textInput.current?.blur()
-      setShowAutocomplete(false)
       navigation.setParams({q: searchText})
     }
   }, [navigation, searchText, updateSearchHistory])
@@ -609,10 +609,10 @@ export function SearchScreen(
   )
 
   const handleHistoryItemClick = (item: string) => {
+    setShowAutocomplete(false)
     if (isWeb) {
       navigation.push('Search', {q: item})
     } else {
-      setShowAutocomplete(false)
       navigation.setParams({q: item})
     }
   }