diff --git a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt index a66d53fe10..97883f8378 100644 --- a/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt +++ b/features/feed/impl/src/main/kotlin/com/tangem/features/feed/components/DefaultFeedEntryComponent.kt @@ -129,13 +129,17 @@ internal class DefaultFeedEntryComponent @AssistedInject constructor( onHeaderSizeChange: (Dp) -> Unit, modifier: Modifier, ) { - BackHandler(enabled = bottomSheetState.value == BottomSheetState.EXPANDED) { + val stackStack = stack.subscribeAsState() + BackHandler( + enabled = bottomSheetState.value == BottomSheetState.EXPANDED && + stackStack.value.active.configuration !is FeedEntryChildFactory.Child.Feed, + ) { onChildBack() } EntryContent( bottomSheetState = bottomSheetState, - stackState = stack.subscribeAsState(), + stackState = stackStack, onHeaderSizeChange = onHeaderSizeChange, isOpenedInBottomSheet = true, )