diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt
index 9964ac424d..3826cc503f 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/modal/TangemModalBottomSheetWithFooter.kt
@@ -1,6 +1,7 @@
 package com.tangem.core.ui.components.bottomsheets.modal
 
 import android.content.res.Configuration
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -49,7 +50,7 @@ inline fun <reified T : TangemBottomSheetConfigContent> TangemModalBottomSheetWi
     noinline onBack: (() -> Unit)? = null,
     crossinline title: @Composable BoxScope.(T) -> Unit = {},
     crossinline content: @Composable (T) -> Unit,
-    crossinline footer: @Composable (BoxScope.(T) -> Unit),
+    noinline footer: @Composable (BoxScope.(T) -> Unit)?,
 ) {
     val isAlwaysVisible = LocalBottomSheetAlwaysVisible.current
 
@@ -84,7 +85,7 @@ inline fun <reified T : TangemBottomSheetConfigContent> DefaultModalBottomSheetW
     noinline onBack: (() -> Unit)? = null,
     crossinline title: @Composable BoxScope.(T) -> Unit,
     crossinline content: @Composable (T) -> Unit,
-    crossinline footer: @Composable (BoxScope.(T) -> Unit),
+    noinline footer: @Composable (BoxScope.(T) -> Unit)?,
 ) {
     var isVisible by remember { mutableStateOf(value = config.isShown) }
     val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = skipPartiallyExpanded)
@@ -118,7 +119,7 @@ inline fun <reified T : TangemBottomSheetConfigContent> PreviewModalBottomSheetW
     skipPartiallyExpanded: Boolean = true,
     crossinline title: @Composable BoxScope.(T) -> Unit,
     crossinline content: @Composable (T) -> Unit,
-    crossinline footer: @Composable BoxScope.(T) -> Unit,
+    noinline footer: @Composable (BoxScope.(T) -> Unit)?,
 ) {
     BasicModalBottomSheetWithFooter<T>(
         config = config,
@@ -145,7 +146,7 @@ inline fun <reified T : TangemBottomSheetConfigContent> BasicModalBottomSheetWit
     noinline onBack: (() -> Unit)? = null,
     crossinline title: @Composable BoxScope.(T) -> Unit,
     crossinline content: @Composable (T) -> Unit,
-    crossinline footer: @Composable (BoxScope.(T) -> Unit),
+    noinline footer: @Composable (BoxScope.(T) -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
     val model = config.content as? T ?: return
@@ -156,8 +157,13 @@ inline fun <reified T : TangemBottomSheetConfigContent> BasicModalBottomSheetWit
         val scrollState = rememberScrollState(initial = initial)
 
         val isKeyboardOpen by rememberIsKeyboardVisible()
-        val buttonHeight = TangemTheme.dimens.spacing80
-        val contentBottomPadding = TangemTheme.dimens.spacing80
+        val buttonHeight by animateDpAsState(
+            if (footer != null) {
+                80.dp
+            } else {
+                0.dp
+            },
+        )
         // Offset calculation for keyboard scroll adjustment:
         // 1) Button height (footer)
         // 2) Column content bottom padding
@@ -202,7 +208,7 @@ inline fun <reified T : TangemBottomSheetConfigContent> BasicModalBottomSheetWit
                 Column(
                     modifier = Modifier
                         .verticalScroll(state = scrollState)
-                        .padding(bottom = contentBottomPadding),
+                        .padding(bottom = buttonHeight),
                 ) {
                     content(model)
                 }
@@ -218,7 +224,9 @@ inline fun <reified T : TangemBottomSheetConfigContent> BasicModalBottomSheetWit
                         .height(buttonHeight)
                         .align(Alignment.BottomCenter),
                 ) {
-                    footer(model)
+                    if (footer != null) {
+                        footer(model)
+                    }
                 }
             }
         }
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorModel.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorModel.kt
index 2784044d44..07e8e30c81 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorModel.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/model/FeeSelectorModel.kt
@@ -127,6 +127,9 @@ internal class FeeSelectorModel @Inject constructor(
             )
         }
         uiState.update(FeeItemSelectedTransformer(feeItem))
+        if (feeItem !is FeeItem.Custom) {
+            onDoneClick()
+        }
     }
 
     override fun onCustomFeeValueChange(index: Int, value: String) {
diff --git a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt
index c99b647b80..d9aea80f8c 100644
--- a/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt
+++ b/features/send-v2/impl/src/main/java/com/tangem/features/send/v2/feeselector/ui/FeeSelectorModalBottomSheet.kt
@@ -82,15 +82,19 @@ internal fun FeeSelectorModalBottomSheet(
                 modifier = Modifier.padding(vertical = 4.dp, horizontal = 12.dp),
             )
         },
-        footer = {
-            PrimaryButton(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(16.dp),
-                enabled = state.isPrimaryButtonEnabled,
-                text = stringResourceSafe(R.string.common_done),
-                onClick = feeSelectorIntents::onDoneClick,
-            )
+        footer = if (state.selectedFeeItem is FeeItem.Custom) {
+            {
+                PrimaryButton(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(16.dp),
+                    enabled = state.isPrimaryButtonEnabled,
+                    text = stringResourceSafe(R.string.common_done),
+                    onClick = feeSelectorIntents::onDoneClick,
+                )
+            }
+        } else {
+            null
         },
     )
 }
@@ -426,7 +430,14 @@ private class FeeSelectorUMContentProvider : CollectionPreviewParameterProvider<
                 FeeItem.Fast(fee = Fee.Common(Amount(value = BigDecimal("0.03"), blockchain = Blockchain.Ethereum))),
                 customFeeItem,
             ),
-            selectedFeeItem = customFeeItem,
+            selectedFeeItem = FeeItem.Slow(
+                fee = Fee.Common(
+                    Amount(
+                        value = BigDecimal("0.01"),
+                        blockchain = Blockchain.Ethereum,
+                    ),
+                ),
+            ),
             feeExtraInfo = FeeExtraInfo(
                 isFeeApproximate = true,
                 isFeeConvertibleToFiat = true,