diff --git a/CHANGELOG b/CHANGELOG
index 667e24c9b..b6ed6de41 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,7 +7,7 @@ KeePassDX(2.9.2)
  * Fix same save shared info #783
  * Fix switch back to previous keyboard #782
  * Fix read only #792
- * Better UI #719 #534 #617
+ * Better UI #719 #534 #617 #793
 
 KeePassDX(2.9.1)
  * Copy password from generator #697
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
index c0a9d56d8..015ba2c60 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/search/SearchHelper.kt
@@ -34,7 +34,7 @@ import com.kunzisoft.keepass.timeout.TimeoutHelper
 class SearchHelper {
 
     companion object {
-        const val MAX_SEARCH_ENTRY = 6
+        const val MAX_SEARCH_ENTRY = 10
 
         /**
          * Utility method to perform actions if item is found or not after an auto search in [database]
diff --git a/app/src/main/res/layout/item_autofill_entry.xml b/app/src/main/res/layout/item_autofill_entry.xml
index a7202488b..d5b99ab1b 100644
--- a/app/src/main/res/layout/item_autofill_entry.xml
+++ b/app/src/main/res/layout/item_autofill_entry.xml
@@ -38,6 +38,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:paddingRight="12dp"
         android:paddingEnd="12dp"
         android:paddingLeft="0dp"
diff --git a/fastlane/metadata/android/en-US/changelogs/46.txt b/fastlane/metadata/android/en-US/changelogs/46.txt
index b5f2f414b..6635fd7bc 100644
--- a/fastlane/metadata/android/en-US/changelogs/46.txt
+++ b/fastlane/metadata/android/en-US/changelogs/46.txt
@@ -6,4 +6,4 @@
  * Fix same save shared info #783
  * Fix switch back to previous keyboard #782
  * Fix read only #792
- * Better UI #719 #534 #617
\ No newline at end of file
+ * Better UI #719 #534 #617 #793
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/46.txt b/fastlane/metadata/android/fr-FR/changelogs/46.txt
index 75f88e66b..295b59f8a 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/46.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/46.txt
@@ -6,4 +6,4 @@
  * Correction de la sauvegarde d'une même info partagée #783
  * Correction du changement vers le clavier précédent #782
  * Correction de lecture seule #792
- * Meilleure UI #719 #534 #617
\ No newline at end of file
+ * Meilleure UI #719 #534 #617 #793
\ No newline at end of file