diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt
index 342b7510fb..7ae3f990e4 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppBottomBar.kt
@@ -59,9 +59,10 @@ fun AppBottomBar(navController: NavHostController) {
                             // TODO: Make it scrool to the top
                             navController.navigate(item.route){
                                 navController.graph.startDestinationRoute?.let { start ->
-                                    popUpTo(start)
+                                    popUpTo(start) { inclusive = item.route == Route.Home.route }
                                     restoreState = true
                                 }
+
                                 launchSingleTop = true
                                 restoreState = true
                             }