diff --git a/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt b/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
index 3dfc085c10..cc9b89e775 100644
--- a/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
+++ b/app/src/main/java/com/tangem/tap/di/domain/WalletsDomainModule.kt
@@ -1,12 +1,12 @@
 package com.tangem.tap.di.domain
 
 import com.tangem.domain.redux.ReduxStateHolder
-import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.transaction.WalletAddressServiceRepository
 import com.tangem.domain.transaction.usecase.ParseSharedAddressUseCase
 import com.tangem.domain.transaction.usecase.ValidateWalletAddressUseCase
 import com.tangem.domain.transaction.usecase.ValidateWalletMemoUseCase
+import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.repository.WalletNamesMigrationRepository
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.*
@@ -95,8 +95,11 @@ internal object WalletsDomainModule {
 
     @Provides
     @Singleton
-    fun providesRenameWalletUseCase(userWalletsListManager: UserWalletsListManager): RenameWalletUseCase {
-        return RenameWalletUseCase(userWalletsListManager = userWalletsListManager)
+    fun providesRenameWalletUseCase(
+        userWalletsListManager: UserWalletsListManager,
+        dispatchers: CoroutineDispatcherProvider,
+    ): RenameWalletUseCase {
+        return RenameWalletUseCase(userWalletsListManager = userWalletsListManager, dispatchers = dispatchers)
     }
 
     @Provides
diff --git a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/RenameWalletUseCase.kt b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/RenameWalletUseCase.kt
index 4206d4854f..ff568c6794 100644
--- a/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/RenameWalletUseCase.kt
+++ b/domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/RenameWalletUseCase.kt
@@ -8,25 +8,32 @@ import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UpdateWalletError
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.models.UserWalletId
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import kotlinx.coroutines.withContext
 
 /**
  * Use case for rename user wallet
  *
  * @property userWalletsListManager user wallets list manager
  */
-class RenameWalletUseCase(private val userWalletsListManager: UserWalletsListManager) {
+class RenameWalletUseCase(
+    private val userWalletsListManager: UserWalletsListManager,
+    private val dispatchers: CoroutineDispatcherProvider,
+) {
 
     suspend operator fun invoke(userWalletId: UserWalletId, name: String): Either<UpdateWalletError, UserWallet> =
-        either {
-            val existingNames = userWalletsListManager.userWalletsSync
+        withContext(dispatchers.io) {
+            either {
+                val existingNames = userWalletsListManager.userWalletsSync
 
-            ensure(existingNames.none { it.name == name && it.walletId != userWalletId }) {
-                UpdateWalletError.NameAlreadyExists
-            }
+                ensure(existingNames.none { it.name == name && it.walletId != userWalletId }) {
+                    UpdateWalletError.NameAlreadyExists
+                }
 
-            when (val result = userWalletsListManager.update(userWalletId) { it.copy(name = name) }) {
-                is CompletionResult.Failure -> raise(UpdateWalletError.DataError(result.error))
-                is CompletionResult.Success -> result.data
+                when (val result = userWalletsListManager.update(userWalletId) { it.copy(name = name) }) {
+                    is CompletionResult.Failure -> raise(UpdateWalletError.DataError(result.error))
+                    is CompletionResult.Success -> result.data
+                }
             }
         }
 }
\ No newline at end of file
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/impl/DefaultRenameWalletComponent.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/impl/DefaultRenameWalletComponent.kt
index 15ab597e72..902d26f1ef 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/impl/DefaultRenameWalletComponent.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/impl/DefaultRenameWalletComponent.kt
@@ -34,8 +34,8 @@ internal class DefaultRenameWalletComponent @AssistedInject constructor(
     private val stateFlow: MutableStateFlow<RenameWalletUM> = MutableStateFlow(
         value = RenameWalletUM(
             walletNameValue = TextFieldValue(text = params.currentName),
-            isNameCorrect = false,
             updateValue = ::updateValue,
+            isConfirmEnabled = false,
             onConfirm = { renameWallet(params.userWalletId) },
         ),
     )
@@ -58,12 +58,14 @@ internal class DefaultRenameWalletComponent @AssistedInject constructor(
         stateFlow.update {
             it.copy(
                 walletNameValue = value,
-                isNameCorrect = value.text.isNotBlank() && value.text != currentWalletName,
+                isConfirmEnabled = value.text.isNotBlank() && value.text != currentWalletName,
             )
         }
     }
 
     private fun renameWallet(userWalletId: UserWalletId) = componentScope.launch {
+        stateFlow.update { it.copy(isConfirmEnabled = false) }
+
         val newName = stateFlow.value.walletNameValue
         val maybeError = renameWalletUseCase(userWalletId, newName.text).leftOrNull()
 
@@ -71,9 +73,7 @@ internal class DefaultRenameWalletComponent @AssistedInject constructor(
             Timber.e("Unable to rename wallet: $maybeError")
 
             val message = when (maybeError) {
-                is UpdateWalletError.DataError -> resourceReference(
-                    id = R.string.common_unknown_error,
-                )
+                is UpdateWalletError.DataError -> resourceReference(id = R.string.common_unknown_error)
                 is UpdateWalletError.NameAlreadyExists -> resourceReference(
                     id = R.string.user_wallet_list_rename_popup_error_already_exists,
                     formatArgs = wrappedList(newName),
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewRenameWalletComponent.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewRenameWalletComponent.kt
index ff42b59689..fbcb3d6389 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewRenameWalletComponent.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/component/preview/PreviewRenameWalletComponent.kt
@@ -10,7 +10,7 @@ internal class PreviewRenameWalletComponent : RenameWalletComponent {
 
     private val previewState = RenameWalletUM(
         walletNameValue = TextFieldValue(text = "My Wallet"),
-        isNameCorrect = false,
+        isConfirmEnabled = false,
         updateValue = {},
         onConfirm = {},
     )
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/RenameWalletUM.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/RenameWalletUM.kt
index 4dd5b8c7a7..730cc1ee60 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/RenameWalletUM.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/entity/RenameWalletUM.kt
@@ -6,7 +6,7 @@ import androidx.compose.ui.text.input.TextFieldValue
 @Immutable
 internal data class RenameWalletUM(
     val walletNameValue: TextFieldValue,
-    val isNameCorrect: Boolean,
     val updateValue: (value: TextFieldValue) -> Unit,
+    val isConfirmEnabled: Boolean,
     val onConfirm: () -> Unit,
 )
\ No newline at end of file
diff --git a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/RenameWalletDialog.kt b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/RenameWalletDialog.kt
index fa02de24c9..5ff04fe2e7 100644
--- a/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/RenameWalletDialog.kt
+++ b/features/wallet-settings/impl/src/main/kotlin/com/tangem/feature/walletsettings/ui/RenameWalletDialog.kt
@@ -23,7 +23,7 @@ internal fun RenameWalletDialog(model: RenameWalletUM, onDismiss: () -> Unit) {
         fieldValue = value,
         confirmButton = DialogButton(
             title = stringResource(id = R.string.common_ok),
-            enabled = model.isNameCorrect,
+            enabled = model.isConfirmEnabled,
             onClick = model.onConfirm,
         ),
         dismissButton = DialogButton(