diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
index 70228f077..44df0db98 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceKeys.kt
@@ -158,4 +158,6 @@ object PreferenceKeys {
     const val eh_hl_refreshFrequency = "eh_nh_refresh_frequency"
 
     const val eh_hl_lastRefresh = "eh_nh_last_refresh"
+
+    const val eh_expandFilters = "eh_expand_filters"
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
index 28659bfb0..d288aea71 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
@@ -230,4 +230,6 @@ class PreferencesHelper(val context: Context) {
 
     fun eh_hl_lastRefresh() = rxPrefs.getLong(Keys.eh_hl_lastRefresh, 0L)
     // <-- EH
+
+    fun eh_expandFilters() = rxPrefs.getBoolean(Keys.eh_expandFilters, false)
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt
index 325371d94..f984b0795 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/filter/GroupItem.kt
@@ -8,13 +8,19 @@ import eu.davidea.flexibleadapter.items.AbstractExpandableHeaderItem
 import eu.davidea.flexibleadapter.items.ISectionable
 import eu.davidea.viewholders.ExpandableViewHolder
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
 import eu.kanade.tachiyomi.source.model.Filter
 import eu.kanade.tachiyomi.util.setVectorCompat
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 
 class GroupItem(val filter: Filter.Group<*>) : AbstractExpandableHeaderItem<GroupItem.Holder, ISectionable<*, *>>() {
 
     init {
-        isExpanded = false
+        // --> EH
+        isExpanded = Injekt.get<PreferencesHelper>().eh_expandFilters().getOrDefault()
+        // <-- EH
     }
 
     override fun getLayoutRes(): Int {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index f7148c513..6bd854ef7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -177,18 +177,26 @@ class SettingsGeneralController : SettingsController() {
                 true
             }
         }
+
+        // --> EH
+        switchPreference {
+            key = Keys.eh_expandFilters
+            title = "Expand all search filters by default"
+            defaultValue = false
+        }
+
         preferenceCategory {
             title = "Application lock"
 
             LockPreference(context).apply {
-                key = "pref_app_lock"
+                key = "pref_app_lock" // Not persistent so use random key
                 isPersistent = false
 
                 addPreference(this)
             }
 
             FingerLockPreference(context).apply {
-                key = "pref_lock_finger"
+                key = "pref_lock_finger" // Not persistent so use random key
                 isPersistent = false
 
                 addPreference(this)
@@ -205,6 +213,7 @@ class SettingsGeneralController : SettingsController() {
                 defaultValue = false
             }
         }
+        // <-- EH
     }
 
     class LibraryColumnsDialog : DialogController() {