diff --git a/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt b/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
index 201357c91..e3594269b 100644
--- a/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
+++ b/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
@@ -35,10 +35,8 @@ class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider
         titleRes = R.string.pref_app_theme_title
       }
 
-      val values =
-        activity.resources.getStringArray(R.array.directory_structure_values)
-      val titles =
-        activity.resources.getStringArray(R.array.directory_structure_entries)
+      val values = activity.resources.getStringArray(R.array.directory_structure_values)
+      val titles = activity.resources.getStringArray(R.array.directory_structure_entries)
       val items = values.zip(titles).map { SelectionItem(it.first, it.second, null) }
       singleChoice(PreferenceKeys.DIRECTORY_STRUCTURE, items) {
         initialSelection = DirectoryStructure.DEFAULT.value
diff --git a/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt b/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt
index 31895b8ac..ecc7a51cc 100644
--- a/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt
+++ b/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt
@@ -56,7 +56,7 @@ object PreferenceKeys {
   const val LENGTH = "length"
   const val OREO_AUTOFILL_CUSTOM_PUBLIC_SUFFIXES = "oreo_autofill_custom_public_suffixes"
   const val OREO_AUTOFILL_DEFAULT_USERNAME = "oreo_autofill_default_username"
-  const val DIRECTORY_STRUCTURE = "directory_structure"
+  const val DIRECTORY_STRUCTURE = "oreo_autofill_directory_structure"
   const val PREF_KEY_PWGEN_TYPE = "pref_key_pwgen_type"
   const val REPOSITORY_INITIALIZED = "repository_initialized"
   const val REPO_CHANGED = "repo_changed"