diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml
index d60940d2..adfb6264 100644
--- a/src/keepass2android/Resources/values/config.xml
+++ b/src/keepass2android/Resources/values/config.xml
@@ -67,6 +67,7 @@
     <string name="keyfile_key">keyfile</string>
     <string name="maskpass_key">maskpass</string>
   <string name="masktotp_key">masktotp</string>
+  <string name="NoAutofillDisabling">NoAutofillDisabling</string>
     <string name="omitbackup_key">omitbackup</string>    
     <string name="list_size_key">list_size</string>
 	<string name="design_key">design_key</string>
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 6b657d15..f7706208 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -190,6 +190,9 @@
   <string name="masktotp_title">Mask TOTP field</string>
   <string name="masktotp_summary">Hide TOTP field by default</string>
 
+  <string name="NoAutofillDisabling_title">No option to disable autofill</string>
+  <string name="NoAutofillDisabling_summary">If activated, the app will not show the option to disable autofill for specific entries.</string>
+
   <string name="menu_about">About</string>
   <string name="menu_change_key">Change Master Key</string>
   <string name="menu_copy_pass">Copy Password</string>
diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android/Resources/xml/preferences.xml
index acdda907..7490235f 100644
--- a/src/keepass2android/Resources/xml/preferences.xml
+++ b/src/keepass2android/Resources/xml/preferences.xml
@@ -454,6 +454,14 @@
        android:title="@string/InlineSuggestions_title"
        android:key="@string/InlineSuggestions_key" />
 
+        <CheckBoxPreference
+          android:enabled="true"
+          android:persistent="true"
+          android:summary="@string/NoAutofillDisabling_summary"
+          android:defaultValue="true"
+          android:title="@string/NoAutofillDisabling_title"
+          android:key="@string/NoAutofillDisabling_key" />
+
 		  <keepass2android.AutofillDisabledQueriesPreference
 		    android:title="@string/AutofillDisabledQueriesPreference_title"
 		    android:summary="@string/AutofillDisabledQueriesPreference_summary"