diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config
index 64ae04d208..985642c135 160000
--- a/app/src/main/assets/tangem-app-config
+++ b/app/src/main/assets/tangem-app-config
@@ -1 +1 @@
-Subproject commit 64ae04d2086e5a605dd4da3cba4af32a60d46c79
+Subproject commit 985642c135606ba1f59fd739127aec03024da79b
diff --git a/app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt b/app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt
index 652b86af80..f05044368f 100644
--- a/app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/extensions/LazyListState.kt
@@ -1,11 +1,9 @@
 package com.tangem.tap.common.compose.extensions
 
-import android.content.Context
-import android.view.inputmethod.InputMethodManager
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.*
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
+import com.tangem.tap.common.extensions.hideKeyboard
 
 @Composable
 fun LazyListState.OnBottomReached(loadMoreThreshold: Int, loadMore: () -> Unit) {
@@ -25,13 +23,7 @@ fun LazyListState.OnBottomReached(loadMoreThreshold: Int, loadMore: () -> Unit)
 
 @Composable
 fun LazyListState.HideKeyboardOnScroll() {
-    val context = LocalContext.current
-    val view = LocalView.current
-    LaunchedEffect(firstVisibleItemIndex) {
-        if (firstVisibleItemIndex > 1) {
-            val inputMethodManager =
-                context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-            inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
-        }
+    if (isScrollInProgress) {
+        LocalView.current.hideKeyboard()
     }
 }
\ No newline at end of file