From ac692c77f56c51279015ed253e861029e1d446bb Mon Sep 17 00:00:00 2001
From: Ryan Skinner <ryan@42north.ca>
Date: Wed, 22 May 2024 16:38:10 -0400
Subject: [PATCH] fixing navigation issue

---
 src/view/screens/Search/Search.tsx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/view/screens/Search/Search.tsx b/src/view/screens/Search/Search.tsx
index 29c3241622..f8948e4413 100644
--- a/src/view/screens/Search/Search.tsx
+++ b/src/view/screens/Search/Search.tsx
@@ -603,10 +603,10 @@ export function SearchScreen(
       updateSearchHistory(item)
 
       if (isWeb) {
-        navigation.push('Search', {q: item})
+        navigation.replace('Search', {q: item})
       } else {
         textInput.current?.blur()
-        navigation.setParams({q: item})
+        navigation.replace('Search', {q: item})
       }
     },
     [updateSearchHistory, navigation],
@@ -619,13 +619,19 @@ export function SearchScreen(
       updateSelectedProfiles(profile)
 
       if (isWeb) {
-        navigation.push('Profile', {name: profile.handle})
+        navigation.reset({
+          index: 1,
+          routes: [
+            {name: 'Search', params: {q: searchText}},
+            {name: 'Profile', params: {name: profile.handle}},
+          ],
+        })
       } else {
         textInput.current?.blur()
         navigation.navigate('Profile', {name: profile.handle})
       }
     },
-    [updateSelectedProfiles, navigation],
+    [updateSelectedProfiles, navigation, searchText],
   )
 
   const onSubmit = React.useCallback(() => {