diff --git a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
index 0556d4db5..76a1dd0ef 100644
--- a/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/autofill/AutofillHelper.kt
@@ -288,7 +288,7 @@ object AutofillHelper {
         return InlinePresentation(
                 InlineSuggestionUi.newContentBuilder(pendingIntent).apply {
                     setContentDescription(context.getString(R.string.autofill_sign_in_prompt))
-                    setTitle(context.getString(R.string.autofill_manual_selection_prompt))
+                    setTitle(context.getString(R.string.autofill_select_entry))
                     setStartIcon(Icon.createWithResource(context, R.drawable.ic_arrow_right_green_24dp).apply {
                         setTintBlendMode(BlendMode.DST)
                     })
@@ -349,8 +349,7 @@ object AutofillHelper {
                 webScheme = parseResult.webScheme
                 manualSelection = true
             }
-            val manualSelectionView = RemoteViews(context.packageName, R.layout.item_autofill_entry)
-            manualSelectionView.setTextViewText(R.id.autofill_entry_text, context.getString(R.string.autofill_manual_selection_prompt))
+            val manualSelectionView = RemoteViews(context.packageName, R.layout.item_autofill_select_entry)
             val pendingIntent = AutofillLauncherActivity.getPendingIntentForSelection(context,
                     searchInfo, inlineSuggestionsRequest)
 
@@ -367,7 +366,7 @@ object AutofillHelper {
                             }
                         }
                     }
-                    builder.setValue(id, AutofillValue.forText("dummy"))
+                    builder.setValue(id, null)
                     builder.setAuthentication(pendingIntent.intentSender)
                     responseBuilder.addDataset(builder.build())
                 }
diff --git a/app/src/main/res/layout/item_autofill_select_entry.xml b/app/src/main/res/layout/item_autofill_select_entry.xml
index 65a9c6071..83be64e47 100644
--- a/app/src/main/res/layout/item_autofill_select_entry.xml
+++ b/app/src/main/res/layout/item_autofill_select_entry.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/windowBackground"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:minHeight="36dp"
     android:orientation="horizontal">
     <ImageView
         android:layout_width="24dp"
@@ -26,7 +26,7 @@
         android:layout_gravity="center"
         android:layout_marginStart="12dp"
         android:layout_marginLeft="12dp"
-        android:contentDescription="@string/app_name"
+        android:contentDescription="@string/autofill_select_entry"
         android:src="@drawable/ic_arrow_right_green_24dp"/>
     <TextView
         android:layout_width="wrap_content"
@@ -38,5 +38,5 @@
         android:paddingEnd="12dp"
         android:paddingLeft="12dp"
         android:paddingStart="12dp"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall" />
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 584c78cba..9bd7bdd16 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -449,7 +449,6 @@
     <string name="validate">Validieren</string>
     <string name="autofill_auto_search_summary">Suchergebnisse automatisch nach Web-Domain oder Anwendungs-ID vorschlagen</string>
     <string name="autofill_auto_search_title">Automatische Suche</string>
-    <string name="autofill_manual_selection_prompt">Eintrag auswählen...</string>
     <string name="autofill_manual_selection_title">Manuelle Auswahl</string>
     <string name="autofill_manual_selection_summary">Manuelle Auswahl des Datenbank-Eintrags ermöglichen</string>
     <string name="lock_database_show_button_summary">Zeigt die Sperrtaste in der Benutzeroberfläche an</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6bd57818a..a5698feba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -488,7 +488,6 @@
     <string name="autofill_auto_search_summary">Automatically suggest search results from the web domain or application ID</string>
     <string name="autofill_inline_suggestions_title">Inline suggestions</string>
     <string name="autofill_inline_suggestions_summary">Attempt to display autofill suggestions directly from a compatible keyboard</string>
-    <string name="autofill_manual_selection_prompt">Select entry...</string>
     <string name="autofill_manual_selection_title">Manual selection</string>
     <string name="autofill_manual_selection_summary">Display option to let the user select database entry</string>
     <string name="autofill_save_search_info_title">Save search info</string>