diff --git a/app/src/main/java/wannabit/io/cosmostaion/ui/init/WalletSelectViewHolder.kt b/app/src/main/java/wannabit/io/cosmostaion/ui/init/WalletSelectViewHolder.kt
index 4c2d078a3..8c9071dfe 100644
--- a/app/src/main/java/wannabit/io/cosmostaion/ui/init/WalletSelectViewHolder.kt
+++ b/app/src/main/java/wannabit/io/cosmostaion/ui/init/WalletSelectViewHolder.kt
@@ -11,9 +11,9 @@ import androidx.recyclerview.widget.RecyclerView
 import wannabit.io.cosmostaion.R
 import wannabit.io.cosmostaion.chain.BaseChain
 import wannabit.io.cosmostaion.chain.FetchState
-import wannabit.io.cosmostaion.chain.fetcher.OktFetcher
 import wannabit.io.cosmostaion.chain.PubKeyType
 import wannabit.io.cosmostaion.chain.evmClass.ChainOktEvm
+import wannabit.io.cosmostaion.chain.fetcher.OktFetcher
 import wannabit.io.cosmostaion.chain.majorClass.ChainBitCoin84
 import wannabit.io.cosmostaion.chain.majorClass.ChainSui
 import wannabit.io.cosmostaion.chain.majorClass.SUI_MAIN_DENOM
@@ -236,12 +236,7 @@ class WalletSelectViewHolder(
             chainName.text = chain.name.uppercase()
             chainTypeBadge.visibility = View.GONE
 
-            if (chain is ChainBitCoin84) {
-                chainAddress.text = chain.mainAddress
-                chainAddress.visibility = View.VISIBLE
-                chainEvmAddress.visibility = View.GONE
-
-            } else if (chain.isEvmCosmos()) {
+            if (chain.isEvmCosmos()) {
                 chainAddress.text = chain.address
                 chainEvmAddress.text = chain.evmAddress
                 chainAddress.visibility = View.INVISIBLE
@@ -251,7 +246,13 @@ class WalletSelectViewHolder(
                 handler.postDelayed(starEvmAddressAnimation, 5000)
 
             } else {
-                chainAddress.text = chain.address
+                chainAddress.text = if (chain is ChainBitCoin84) {
+                    chain.mainAddress
+                } else if (chain.isSupportErc20()) {
+                    chain.evmAddress
+                } else {
+                    chain.address
+                }
                 chainAddress.visibility = View.VISIBLE
                 chainEvmAddress.visibility = View.GONE
 
@@ -319,7 +320,7 @@ class WalletSelectViewHolder(
                             chainDenom.text = chain.coinSymbol
                         }
 
-                    } else {
+                    } else if (chain.supportCosmos()) {
                         BaseData.getAsset(chain.apiName, chain.stakeDenom)?.let { asset ->
                             val availableAmount =
                                 chain.cosmosFetcher?.balanceAmount(chain.stakeDenom)
@@ -329,6 +330,15 @@ class WalletSelectViewHolder(
                             chainDenom.text = asset.symbol
                             chainDenom.setTextColor(asset.assetColor())
                         }
+
+                    } else {
+                        val availableAmount = chain.evmRpcFetcher?.evmBalance?.movePointLeft(18)
+                            ?.setScale(18, RoundingMode.DOWN)
+                        chainBalance.text = formatAmount(availableAmount.toString(), 18)
+                        chainDenom.text = chain.coinSymbol
+                        BaseData.getAsset(chain.apiName, chain.stakeDenom)?.let { asset ->
+                            chainDenom.setTextColor(asset.assetColor())
+                        }
                     }
                 }
 
diff --git a/app/src/main/java/wannabit/io/cosmostaion/ui/main/ChainEditViewHolder.kt b/app/src/main/java/wannabit/io/cosmostaion/ui/main/ChainEditViewHolder.kt
index 958e2aba8..71c403b81 100644
--- a/app/src/main/java/wannabit/io/cosmostaion/ui/main/ChainEditViewHolder.kt
+++ b/app/src/main/java/wannabit/io/cosmostaion/ui/main/ChainEditViewHolder.kt
@@ -216,6 +216,8 @@ class ChainEditViewHolder(
             } else {
                 chainAddress.text = if (chain is ChainBitCoin84) {
                     chain.mainAddress
+                } else if (chain.isSupportErc20()) {
+                    chain.evmAddress
                 } else {
                     chain.address
                 }