diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
index eaa24e535..fb74884dc 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -209,7 +209,7 @@ class FileDatabaseSelectActivity : StylishActivity(),
                     }
                     // Remove the search info from intent
                     if (searchInfo != null) {
-                        finish()
+                        intent.removeExtra(KEY_SEARCH_INFO)
                     }
                 },
                 {
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index 766cda86d..2418368dd 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -986,7 +986,11 @@ class GroupActivity : LockingActivity(),
                 } else {
                     // To restore standard mode
                     EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
-                    moveTaskToBack(true)
+                    // Go to home
+                    startActivity(Intent(Intent.ACTION_MAIN).apply {
+                        addCategory(Intent.CATEGORY_HOME)
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    })
                 }
             }
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
index ad8fa4512..ea89dc515 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
@@ -269,7 +269,7 @@ open class PasswordActivity : StylishActivity() {
                             readOnly)
                     // Remove the search info from intent
                     if (searchInfo != null) {
-                        finish()
+                        intent.removeExtra(KEY_SEARCH_INFO)
                     }
                 },
                 {