diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
index dc46c311f..d577f0038 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
@@ -157,8 +157,7 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
         menuFilterDownloaded.isChecked = presenter.onlyDownloaded()
         menuFilterBookmarked.isChecked = presenter.onlyBookmarked()
 
-        val showSortOptions = !(presenter.preferences.eh_forceSortEhVersionsAsc().getOrDefault()
-                && presenter.source.isEhBasedSource())
+        val showSortOptions = !presenter.isSortingForced()
         menuSort.isVisible = showSortOptions
         menuSortingMode.isVisible = showSortOptions
 
@@ -419,7 +418,8 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
 
     private fun markPreviousAsRead(chapter: ChapterItem) {
         val adapter = adapter ?: return
-        val chapters = if (presenter.sortDescending()) adapter.items.reversed() else adapter.items
+        val chapters = if (presenter.sortDescending()
+                || presenter.isSortingForced()) adapter.items.reversed() else adapter.items
         val chapterPos = chapters.indexOf(chapter)
         if (chapterPos != -1) {
             markAsRead(chapters.take(chapterPos))
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
index 701cf529b..4c2be02fe 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersPresenter.kt
@@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.util.syncChaptersWithSource
 import exh.EH_SOURCE_ID
 import exh.EXH_SOURCE_ID
 import exh.eh.EHentaiUpdateHelper
+import exh.isEhBasedSource
 import rx.Observable
 import rx.Subscription
 import rx.android.schedulers.AndroidSchedulers
@@ -446,8 +447,10 @@ class ChaptersPresenter(
      * Whether the sorting method is descending or ascending.
      */
     fun sortDescending(): Boolean {
-        return !((source.id == EH_SOURCE_ID || source.id == EXH_SOURCE_ID)
-                && preferences.eh_forceSortEhVersionsAsc().getOrDefault()) && manga.sortDescending()
+        return !isSortingForced() && manga.sortDescending()
     }
 
+    fun isSortingForced() = source.isEhBasedSource()
+                && preferences.eh_forceSortEhVersionsAsc().getOrDefault()
+
 }