diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt
index 2e554cee8..df931ea53 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedView.kt
@@ -30,6 +30,7 @@ import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import kotlinx.coroutines.delay
 
 @Composable
 fun FeedView(
@@ -96,6 +97,11 @@ private fun FeedLoaded(
 ) {
     val listState = rememberLazyListState()
 
+    LaunchedEffect(Unit) {
+        delay(500)
+        listState.animateScrollToItem(0)
+    }
+
     LazyColumn(
         contentPadding = PaddingValues(
             top = 10.dp,
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
index b90293bf6..7c66c1afe 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
@@ -88,8 +88,6 @@ fun SearchScreen(accountViewModel: AccountViewModel, navController: NavControlle
 
     LaunchedEffect(Unit) {
         feedViewModel.invalidateData()
-        delay(500)
-        feedViewModel.invalidateData()
     }
 
     DisposableEffect(accountViewModel) {