diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index 9c61e0c402..70f062d9ea 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -8,7 +8,6 @@ import com.tangem.tap.common.analytics.AnalyticsEvent
 import com.tangem.tap.common.analytics.AnalyticsParam
 import com.tangem.tap.common.analytics.GetCardSourceParams
 import com.tangem.tap.common.extensions.dispatchOnMain
-import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.extensions.withMainContext
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -218,13 +217,11 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
             }
         }
         is BackupAction.GoToShop -> {
-            backupState.buyAdditionalCardsUrl?.let { url ->
-                store.dispatchOpenUrl(url)
-                store.state.globalState.analyticsHandlers?.triggerEvent(
-                    event = AnalyticsEvent.GET_CARD,
-                    params = mapOf(AnalyticsParam.SOURCE.param to GetCardSourceParams.ONBOARDING.param)
-                )
-            }
+            store.dispatch(NavigationAction.NavigateTo(AppScreen.Shop))
+            store.state.globalState.analyticsHandlers?.triggerEvent(
+                event = AnalyticsEvent.GET_CARD,
+                params = mapOf(AnalyticsParam.SOURCE.param to GetCardSourceParams.ONBOARDING.param)
+            )
         }
         is BackupAction.FinishAddingBackupCards -> {
             if (backupService.addedBackupCardsCount == 1) {
@@ -236,9 +233,11 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
         }
         is BackupAction.CheckAccessCode -> {
             if (action.accessCode.length < 4) {
-                store.dispatch(BackupAction.SetAccessCodeError(
-                    AccessCodeError.CodeTooShort
-                ))
+                store.dispatch(
+                    BackupAction.SetAccessCodeError(
+                        AccessCodeError.CodeTooShort
+                    )
+                )
             } else {
                 store.dispatch(BackupAction.SetAccessCodeError(null))
                 store.dispatch(BackupAction.SaveFirstAccessCode(action.accessCode))
@@ -250,9 +249,11 @@ private fun handleBackupAction(appState: () -> AppState?, action: BackupAction)
                 backupService.setAccessCode(action.accessCodeConfirmation)
                 store.dispatch(BackupAction.PrepareToWritePrimaryCard)
             } else {
-                store.dispatch(BackupAction.SetAccessCodeError(
-                    AccessCodeError.CodesDoNotMatch
-                ))
+                store.dispatch(
+                    BackupAction.SetAccessCodeError(
+                        AccessCodeError.CodesDoNotMatch
+                    )
+                )
             }
         }
         is BackupAction.WritePrimaryCard -> {
diff --git a/app/src/main/java/com/tangem/tap/features/shop/ui/ShopFragment.kt b/app/src/main/java/com/tangem/tap/features/shop/ui/ShopFragment.kt
index a360c1700c..b8ce7afd51 100644
--- a/app/src/main/java/com/tangem/tap/features/shop/ui/ShopFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/shop/ui/ShopFragment.kt
@@ -27,6 +27,8 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
 
     private val binding: FragmentShopBinding by viewBinding(FragmentShopBinding::bind)
 
+    lateinit var keyboardObserver: KeyboardObserver
+
     override fun subscribeToStore() {
         store.subscribe(this) { state ->
             state.skipRepeats { oldState, newState ->
@@ -46,6 +48,11 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
         })
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        keyboardObserver.unregisterListener()
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -57,10 +64,10 @@ class ShopFragment : BaseStoreFragment(R.layout.fragment_shop), StoreSubscriber<
             requireActivity().onBackPressed()
         }
 
-
-        val keyboardObserver = KeyboardObserver(requireActivity())
-        keyboardObserver.registerListener { isVisible ->
-            binding.flCards.show(!isVisible)
+        keyboardObserver = KeyboardObserver(requireActivity()).apply {
+            registerListener { isVisible ->
+                binding.flCards.show(!isVisible)
+            }
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c54cf6ea95..c3e70dee2f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,7 +21,6 @@
     <string name="home_ready_title">Get ready to tap your \ncard to the back of the \nphone.</string>
     <string name="home_button_tapin">Tap in</string>
     <string name="home_button_scan">Scan card</string>
-    <string name="home_button_order">Order card</string>
     <string name="home_button_yes">Yes! Scan it.</string>
 
     <string name="wallet_button_scan">Scan</string>