diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
index 78b665cde6..f47a0b3ea1 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/CurrencySelectionDialog.kt
@@ -2,7 +2,6 @@ package com.tangem.tap.features.wallet.ui.wallet
 
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
-import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.features.wallet.redux.WalletDialog
 import com.tangem.tap.store
@@ -16,27 +15,25 @@ object CurrencySelectionDialog {
         val currenciesToShow = dialog.currenciesList
             .map { it.displayName }
             .toTypedArray()
-        var currentSelection = dialog.currenciesList
+        val currentSelection = dialog.currenciesList
             .indexOfFirst { it.code == dialog.currentAppCurrency.code }
 
         return AlertDialog.Builder(context)
             .setTitle(context.getString(R.string.details_row_title_currency))
             .setNegativeButton(context.getString(R.string.common_cancel)) { _, _ -> /* no-op */ }
-            .setPositiveButton(context.getString(R.string.common_done)) { _, _ ->
-                dialog.currenciesList.getOrNull(currentSelection)?.let { selectedCurrency ->
+            .setOnDismissListener {
+                store.dispatch(WalletAction.DialogAction.Hide)
+            }
+            .setSingleChoiceItems(currenciesToShow, currentSelection) { _, which ->
+                dialog.currenciesList.getOrNull(which)?.let { selectedCurrency ->
                     store.dispatch(
                         WalletAction.AppCurrencyAction.SelectAppCurrency(
                             fiatCurrency = selectedCurrency
                         )
                     )
+                    store.dispatch(WalletAction.DialogAction.Hide)
                 }
             }
-            .setOnDismissListener {
-                store.dispatchDialogHide()
-            }
-            .setSingleChoiceItems(currenciesToShow, currentSelection) { _, which ->
-                currentSelection = which
-            }
             .create()
     }
 }
\ No newline at end of file