diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20d0fc1f8..1863e3db0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -162,7 +162,16 @@
         <activity
             android:name="com.kunzisoft.keepass.settings.DeviceUnlockSettingsActivity" />
         <activity
-            android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity" />
+            android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
+            android:label="@string/keyboard_setting_label"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.kunzisoft.keepass.settings.AutofillSettingsActivity"
+            tools:targetApi="26" />
         <activity
             android:name="com.kunzisoft.keepass.settings.PasskeysSettingsActivity"
             tools:targetApi="34" />
@@ -195,14 +204,6 @@
                 <data android:host="hotp"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.kunzisoft.keepass.settings.MagikeyboardSettingsActivity"
-            android:label="@string/keyboard_setting_label"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-            </intent-filter>
-        </activity>
         <activity
             android:name="com.kunzisoft.keepass.credentialprovider.activity.PasskeyLauncherActivity"
             android:theme="@style/Theme.Transparent"
diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/autofill/AutofillHelper.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/autofill/AutofillHelper.kt
index e93039556..41da11367 100644
--- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/autofill/AutofillHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/autofill/AutofillHelper.kt
@@ -316,11 +316,7 @@ object AutofillHelper {
                     context,
                     0,
                     Intent(context, AutofillSettingsActivity::class.java),
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        PendingIntent.FLAG_IMMUTABLE
-                    } else {
-                        0
-                    }
+                    PendingIntent.FLAG_IMMUTABLE
                 )
                 return InlinePresentation(
                     InlineSuggestionUi.newContentBuilder(pendingIntent).apply {
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsActivity.kt b/app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsActivity.kt
index 048e06b7a..3d53116a3 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsActivity.kt
@@ -19,9 +19,12 @@
  */
 package com.kunzisoft.keepass.settings
 
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.preference.PreferenceFragmentCompat
 import com.kunzisoft.keepass.R
 
+@RequiresApi(Build.VERSION_CODES.O)
 class AutofillSettingsActivity : ExternalSettingsActivity() {
 
     override fun retrieveTitle(): Int {
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsFragment.kt
index abd8445e9..be5844324 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/AutofillSettingsFragment.kt
@@ -21,6 +21,7 @@ package com.kunzisoft.keepass.settings
 
 import android.os.Build
 import android.os.Bundle
+import androidx.annotation.RequiresApi
 import androidx.fragment.app.DialogFragment
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
@@ -29,6 +30,7 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.settings.preferencedialogfragment.AutofillBlocklistAppIdPreferenceDialogFragmentCompat
 import com.kunzisoft.keepass.settings.preferencedialogfragment.AutofillBlocklistWebDomainPreferenceDialogFragmentCompat
 
+@RequiresApi(Build.VERSION_CODES.O)
 class AutofillSettingsFragment : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -42,8 +44,6 @@ class AutofillSettingsFragment : PreferenceFragmentCompat() {
     }
 
     override fun onDisplayPreferenceDialog(preference: Preference) {
-        var otherDialogFragment = false
-
         var dialogFragment: DialogFragment? = null
 
         when (preference.key) {
@@ -53,7 +53,7 @@ class AutofillSettingsFragment : PreferenceFragmentCompat() {
             getString(R.string.autofill_web_domain_blocklist_key) -> {
                 dialogFragment = AutofillBlocklistWebDomainPreferenceDialogFragmentCompat.newInstance(preference.key)
             }
-            else -> otherDialogFragment = true
+            else -> {}
         }
 
         if (dialogFragment != null) {
@@ -62,7 +62,7 @@ class AutofillSettingsFragment : PreferenceFragmentCompat() {
             dialogFragment.show(parentFragmentManager, TAG_AUTOFILL_PREF_FRAGMENT)
         }
         // Could not be handled here. Try with the super method.
-        else if (otherDialogFragment) {
+        else {
             super.onDisplayPreferenceDialog(preference)
         }
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt
index 2bd0344ea..7512a27d8 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedAppSettingsFragment.kt
@@ -201,7 +201,6 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
             false
         }
 
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             findPreference<Preference>(getString(R.string.passkeys_explanation_key))?.setOnPreferenceClickListener {
                 context?.openUrl(R.string.passkeys_explanation_url)
@@ -214,14 +213,16 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
             }
         }
 
-        findPreference<Preference>(getString(R.string.autofill_explanation_key))?.setOnPreferenceClickListener {
-            context?.openUrl(R.string.autofill_explanation_url)
-            false
-        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            findPreference<Preference>(getString(R.string.autofill_explanation_key))?.setOnPreferenceClickListener {
+                context?.openUrl(R.string.autofill_explanation_url)
+                false
+            }
 
-        findPreference<Preference>(getString(R.string.settings_autofill_key))?.setOnPreferenceClickListener {
-            startActivity(Intent(context, AutofillSettingsActivity::class.java))
-            false
+            findPreference<Preference>(getString(R.string.settings_autofill_key))?.setOnPreferenceClickListener {
+                startActivity(Intent(context, AutofillSettingsActivity::class.java))
+                false
+            }
         }
 
         findPreference<Preference>(getString(R.string.clipboard_notifications_key))?.setOnPreferenceChangeListener { _, newValue ->