diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcdaf6fe7..7ef816de4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ finished saving
 - Fixed broken album menu
 - Fixed crash that would occur when opening a file on some devices [#176]
 - Fixed issue where the search filter menu would not display the correct mode
+- Fixed crash when search filter mode was changed
 
 #### What's Changed
 - Reworked typography and iconography to be more aligned with material design guidelines
diff --git a/app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt b/app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt
index 8a6c1cf4f..cac9c9435 100644
--- a/app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt
@@ -126,7 +126,7 @@ class SearchViewModel(application: Application) :
 
         logD("Updating filter mode to $newFilterMode")
 
-        settings.searchFilterMode = filterMode
+        settings.searchFilterMode = newFilterMode
 
         search(lastQuery)
     }
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt b/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
index 741d48fc3..dc666a142 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
@@ -226,6 +226,7 @@ class Settings(private val context: Context, private val callback: Callback? = n
             DisplayMode.fromInt(
                 inner.getInt(context.getString(R.string.set_key_search_filter), Int.MIN_VALUE))
         set(value) {
+            logD(value)
             inner.edit {
                 putInt(
                     context.getString(R.string.set_key_search_filter),