diff --git a/src/components/Nav/AuthModal/ForgotPasswordForm.tsx b/src/components/Nav/AuthModal/ForgotPasswordForm.tsx
index 01cc6187..babd8f8b 100644
--- a/src/components/Nav/AuthModal/ForgotPasswordForm.tsx
+++ b/src/components/Nav/AuthModal/ForgotPasswordForm.tsx
@@ -66,6 +66,7 @@ export const ForgotPasswordForm = () => {
       if (errors && errors.some((error) => error.message.includes('bad user credentials'))) {
         setIsUserNotFound(true)
       }
+      if (data.message) setMessage(data.message)
     } catch (error) {
       console.error(error)
     } finally {
diff --git a/src/components/Nav/SearchModal/SearchModal.tsx b/src/components/Nav/SearchModal/SearchModal.tsx
index 9fdb03df..64faaee7 100644
--- a/src/components/Nav/SearchModal/SearchModal.tsx
+++ b/src/components/Nav/SearchModal/SearchModal.tsx
@@ -55,6 +55,7 @@ export const SearchModal = () => {
   >(
     async () => {
       setIsLoading(true)
+      saveScrollPosition()
       const { hasMore, newShouts } = await loadShoutsSearch({
         limit: FEED_PAGE_SIZE,
         text: inputValue(),