diff --git a/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt
index eb39e37b15..dd900ee21a 100644
--- a/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt
+++ b/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt
@@ -203,7 +203,10 @@ class FeedbackTest : BaseTestCase() {
         val gmailText = "Welcome to Gmail"
 
         setupHooks(
-            additionalAfterSection = { MockProvider.resetEmulateError() },
+            additionalAfterSection = {
+                device.uiDevice.pressBack()
+                MockProvider.resetEmulateError()
+            }
         ).run {
             step("Open 'Main Screen'") {
                 openMainScreen()
@@ -221,6 +224,7 @@ class FeedbackTest : BaseTestCase() {
                 onDetailsScreen { addWalletButton.clickWithAssertion() }
             }
             step("Force show 'Scan warning' dialog"){
+                waitForIdle()
                 runOnUiThread {
                     MainScope().launch {
                         scanFailsRequester.show(AnalyticsParam.ScreensSources.Main)