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 76a4eddd7..5abe06cab 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) {
-                        intent.removeExtra(KEY_SEARCH_INFO)
+                        finish()
                     }
                 },
                 {
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 2418368dd..766cda86d 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -986,11 +986,7 @@ class GroupActivity : LockingActivity(),
                 } else {
                     // To restore standard mode
                     EntrySelectionHelper.removeEntrySelectionModeFromIntent(intent)
-                    // Go to home
-                    startActivity(Intent(Intent.ACTION_MAIN).apply {
-                        addCategory(Intent.CATEGORY_HOME)
-                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    })
+                    moveTaskToBack(true)
                 }
             }
 
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 ea89dc515..ad8fa4512 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) {
-                        intent.removeExtra(KEY_SEARCH_INFO)
+                        finish()
                     }
                 },
                 {