diff --git a/CHANGELOG.md b/CHANGELOG.md
index a77348b012..beefb81194 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co
 
 ## [Unreleased]
 
+### Fixes
+- Fix weird flickering when browsing sources
+- Fix some crashes
+
 ## [1.9.5]
 
 ### Changes
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
index b9ccbff7c4..8b855b5517 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt
@@ -227,7 +227,9 @@ class MangaDetailsPresenter(
 
         presenterScope.launch {
             isLoading = true
-            controller.updateHeader()
+            withUIContext {
+                controller.updateHeader()
+            }
             val tasks = listOf(
                 async { if (fetchMangaNeeded) fetchMangaFromSource() },
                 async { if (fetchChaptersNeeded) fetchChaptersFromSource(false) },
@@ -539,7 +541,7 @@ class MangaDetailsPresenter(
             }
             updateChapter.awaitAll(updates)
             getChapters()
-            withContext(Dispatchers.Main) { view?.updateChapters() }
+            withUIContext { view?.updateChapters() }
         }
     }