diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
index 404a469233..bc085c6dca 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@@ -112,14 +112,14 @@ object OnboardingHelper {
                             backupCardsIds = backupCardsIds?.toSet(),
                         ),
                     )
-                    store.dispatchNavigationAction { push(AppRoute.Wallet) }
+                    store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
                     delay(timeMillis = 1_800)
                     store.dispatchNavigationAction { push(AppRoute.SaveWallet) }
                 }
                 // If device has no biometry and save wallet screen has been shown, then go through old scenario
                 else -> {
                     proceedWithScanResponse(scanResponse, backupCardsIds, hasBackupError)
-                    store.dispatchNavigationAction { push(AppRoute.Wallet) }
+                    store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
                 }
             }
         }
diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
index f1b43ae123..7cb2506f8e 100644
--- a/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
@@ -4,7 +4,6 @@ import com.tangem.common.*
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.guard
 import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.utils.popTo
 import com.tangem.core.analytics.Analytics
 import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.models.UserWallet
@@ -12,7 +11,10 @@ import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.MainScreen
 import com.tangem.tap.common.analytics.events.Onboarding
-import com.tangem.tap.common.extensions.*
+import com.tangem.tap.common.extensions.dispatchNavigationAction
+import com.tangem.tap.common.extensions.dispatchWithMain
+import com.tangem.tap.common.extensions.inject
+import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.utils.coroutines.JobHolder
@@ -124,7 +126,7 @@ internal class SaveWalletMiddleware {
         )
 
         store.dispatchWithMain(SaveWalletAction.AllowToUseBiometrics.Success)
-        store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
+        store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
     }
 
     private fun dismiss(state: SaveWalletState) {
diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
index 5b6249b760..0cf70b6b4f 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListMigration.kt
@@ -4,7 +4,6 @@ import arrow.core.Either
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchain.common.Token
 import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.utils.popTo
 import com.tangem.data.common.currency.CryptoCurrencyFactory
 import com.tangem.domain.card.DerivePublicKeysUseCase
 import com.tangem.domain.common.util.derivationStyleProvider
@@ -126,7 +125,7 @@ internal class TokensListMigration(
         val isNothingToDoWithBlockchain = blockchainsToAdd.isEmpty() && blockchainsToRemove.isEmpty()
         if (isNothingToDoWithTokens && isNothingToDoWithBlockchain) {
             store.dispatchDebugErrorNotification(message = "Nothing to save")
-            store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
+            navigateToWallet()
             return
         }
 
@@ -135,11 +134,23 @@ internal class TokensListMigration(
         derivePublicKeysUseCase(userWalletId = currentUserWallet.walletId, currencies = currencyList)
             .onRight {
                 addCryptoCurrenciesUseCase(userWalletId = currentUserWallet.walletId, currencies = currencyList)
-                store.dispatchNavigationAction { popTo<AppRoute.Wallet>() }
+                navigateToWallet()
             }
             .onLeft { Timber.e(it, "Failed to derive public keys") }
     }
 
+    private fun navigateToWallet() {
+        store.dispatchNavigationAction {
+            val route = AppRoute.Wallet
+
+            if (route in stack) {
+                popTo(route)
+            } else {
+                replaceAll(route)
+            }
+        }
+    }
+
     private suspend fun removeCurrenciesIfNeeded(userWalletId: UserWalletId, currencies: List<CryptoCurrency>) {
         if (currencies.isEmpty()) return
         val currenciesRepository = store.inject(DaggerGraphState::currenciesRepository)
diff --git a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
index 2a564e8a0d..8bd3ee34fc 100644
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@@ -99,7 +99,7 @@ internal class WelcomeMiddleware {
                     signInType = Basic.SignedIn.SignInType.Biometric,
                 )
 
-                store.dispatchNavigationAction { push(AppRoute.Wallet) }
+                store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
                 store.dispatchWithMain(WelcomeAction.ProceedWithBiometrics.Success)
                 store.onUserWalletSelected(userWallet = selectedUserWallet)
 
@@ -131,7 +131,7 @@ internal class WelcomeMiddleware {
                 .doOnSuccess {
                     sendSignedInAnalyticsEvent(scanResponse = scanResponse, signInType = Basic.SignedIn.SignInType.Card)
 
-                    store.dispatchNavigationAction { push(AppRoute.Wallet) }
+                    store.dispatchNavigationAction { replaceAll(AppRoute.Wallet) }
                     store.dispatchWithMain(WelcomeAction.ProceedWithCard.Success)
                     store.onUserWalletSelected(userWallet = userWallet)
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e9709bfd8b..5f2471ff8b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,6 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/fragment_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/background_primary">
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/features/swap/presentation/build.gradle.kts b/features/swap/presentation/build.gradle.kts
index c41603a025..bea28f028c 100644
--- a/features/swap/presentation/build.gradle.kts
+++ b/features/swap/presentation/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     implementation(projects.core.ui)
     implementation(projects.common.routing)
     implementation(projects.common.ui)
+    implementation(projects.core.decompose) // For Route supertype
 
     /** Domain modules **/
     implementation(projects.domain.appCurrency)
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt
index bc5009da3c..19b2c2dca6 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/router/SwapRouter.kt
@@ -33,12 +33,18 @@ internal class SwapRouter(
     }
 
     fun openTokenDetails(userWalletId: UserWalletId, currency: CryptoCurrency) {
-        router.push(
-            AppRoute.CurrencyDetails(
-                userWalletId = userWalletId,
-                currency = currency,
-            ),
+        val route = AppRoute.CurrencyDetails(
+            userWalletId = userWalletId,
+            currency = currency,
         )
+
+        if (route in router.stack) {
+            router.popTo(route)
+        } else {
+            router.pop {
+                router.push(route)
+            }
+        }
     }
 }