diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
index fb6c260728..dd1293ba65 100644
--- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
+++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/ui/components/AddCustomTokenForm.kt
@@ -132,6 +132,10 @@ private fun TextField(model: AddCustomTokenInputField, isError: Boolean) {
     }
 }
 
+/**
+ * Be careful with this function – ExposedDropdownMenuBox can crash the app if it is open and user clicks system back
+ * button. It was fixed in compose-material 1.6.4.
+ */
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 private fun SelectorField(model: AddCustomTokenSelectorField) {
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index a8f85f8c06..42119bfeb6 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -27,7 +27,7 @@ androidx-datastore = "1.0.0"
 compose-compiler = "1.5.9"
 compose-runtime = "1.6.1"
 compose-foundation = "1.6.1"
-compose-material = "1.6.1"
+compose-material = "1.6.4"
 compose-material3 = "1.2.0"
 compose-constraint = "1.0.1"
 compose-navigation = "2.7.7"