diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
index d7b61c3c2..1711c0e50 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
@@ -143,7 +143,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
         drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.END)
 
         // EXH -->
-        navView.setSavedSearches(presenter.source.id, presenter.loadSearches())
+        navView.setSavedSearches(presenter.loadSearches())
         navView.onSaveClicked = {
             MaterialDialog.Builder(navView.context)
                     .title("Save current search query?")
@@ -157,7 +157,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
                                     presenter.sourceFilters
                             )
                             presenter.saveSearches(newSearches)
-                            navView.setSavedSearches(presenter.source.id, newSearches)
+                            navView.setSavedSearches(newSearches)
                         }
                     }
                     .positiveText("Save")
@@ -218,7 +218,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
                             index != indexToDelete
                         }
                         presenter.saveSearches(newSearches)
-                        navView.setSavedSearches(presenter.source.id, newSearches)
+                        navView.setSavedSearches(newSearches)
                     }
                     .cancelable(true)
                     .canceledOnTouchOutside(true)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt
index df34bafc4..d43fea5a7 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/CatalogueNavigationView.kt
@@ -58,7 +58,7 @@ class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs:
     }
 
     // EXH -->
-    fun setSavedSearches(id: Long, searches: List<EXHSavedSearch>) {
+    fun setSavedSearches(searches: List<EXHSavedSearch>) {
         saved_searches.removeAllViews()
 
         val outValue = TypedValue()
@@ -66,7 +66,7 @@ class CatalogueNavigationView @JvmOverloads constructor(context: Context, attrs:
 
         save_search_btn.visibility = if(searches.size < 5) View.VISIBLE else View.GONE
 
-        searches.forEachIndexed { index, search ->
+        searches.withIndex().sortedBy { it.value.name }.forEach { (index, search) ->
             val restoreBtn = TextView(context)
             restoreBtn.text = search.name
             val params = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)