diff --git a/CHANGELOG b/CHANGELOG
index 23c050b41..9abad5cd6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 KeePassDX(4.2.2)
  * Fix database merge algorithm #2223
+ * Fix save search info #2243
 
 KeePassDX(4.2.1)
  * Fix Magikeyboard autosearch #2233
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 238c950d5..7bc23e553 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -871,8 +871,9 @@ class GroupActivity : DatabaseLockActivity(),
                                         entryVersioned,
                                         searchInfo.toRegisterInfo()
                                     )
+                                } else {
+                                    entrySelectedForKeyboardSelection(database, entryVersioned)
                                 }
-                                entrySelectedForKeyboardSelection(database, entryVersioned)
                             }
                             TypeMode.PASSKEY -> {
                                 entrySelectedForPasskeySelection(database, entryVersioned)
@@ -887,8 +888,9 @@ class GroupActivity : DatabaseLockActivity(),
                                         entryVersioned,
                                         searchInfo.toRegisterInfo()
                                     )
+                                } else {
+                                    entrySelectedForAutofillSelection(database, entryVersioned)
                                 }
-                                entrySelectedForAutofillSelection(database, entryVersioned)
                             }
                         }
                         loadGroup()
diff --git a/database/src/main/java/com/kunzisoft/keepass/model/AppOriginEntryField.kt b/database/src/main/java/com/kunzisoft/keepass/model/AppOriginEntryField.kt
index 323a15c3e..bc9580458 100644
--- a/database/src/main/java/com/kunzisoft/keepass/model/AppOriginEntryField.kt
+++ b/database/src/main/java/com/kunzisoft/keepass/model/AppOriginEntryField.kt
@@ -159,5 +159,7 @@ object AppOriginEntryField {
      */
     fun Field.isWebDomain(): Boolean {
         return this.name.startsWith(WEB_DOMAIN_FIELD_NAME)
+                || this.name.contains("_$WEB_DOMAIN_FIELD_NAME")
+                || this.name.contains("${WEB_DOMAIN_FIELD_NAME}_")
     }
 }
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/147.txt b/fastlane/metadata/android/en-US/changelogs/147.txt
index db2d01af9..7c142c059 100644
--- a/fastlane/metadata/android/en-US/changelogs/147.txt
+++ b/fastlane/metadata/android/en-US/changelogs/147.txt
@@ -1 +1,2 @@
- * Fix database merge algorithm #2223
\ No newline at end of file
+ * Fix database merge algorithm #2223
+ * Fix save search info #2243
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/147.txt b/fastlane/metadata/android/fr-FR/changelogs/147.txt
index 94fba0dd3..38d5eb173 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/147.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/147.txt
@@ -1 +1,2 @@
- * Correction de l'algorithme de fusion des bases de données #2223
\ No newline at end of file
+ * Correction de l'algorithme de fusion des bases de données #2223
+ * Correction de la sauvegarde des infos de recherche #2243
\ No newline at end of file