diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/DisappearingScaffold.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/DisappearingScaffold.kt
index d7b3507eb..9cd3b289d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/DisappearingScaffold.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/DisappearingScaffold.kt
@@ -51,14 +51,14 @@ fun DisappearingScaffold(
     val topBehavior =
         enterAlwaysScrollBehavior(
             canScroll = {
-                isActive() && accountViewModel.settings.isImmersiveScrollingActive()
+                topBar != null && isActive() && accountViewModel.settings.isImmersiveScrollingActive()
             },
             reverseLayout = isInvertedLayout,
         )
     val bottomBehavior =
         BottomAppBarDefaults.exitAlwaysScrollBehavior(
             canScroll = {
-                isActive() && accountViewModel.settings.isImmersiveScrollingActive()
+                (bottomBar != null || floatingButton != null) && isActive() && accountViewModel.settings.isImmersiveScrollingActive()
             },
         )