diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index 8da3667d37..aafedba1b9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -762,11 +762,14 @@ class ReaderPresenter(
             notifier.onClear()
 
             // Pictures directory.
-            val destDir = File(
-                Environment.getExternalStorageDirectory().absolutePath +
+            val baseDir = Environment.getExternalStorageDirectory().absolutePath +
                     File.separator + Environment.DIRECTORY_PICTURES +
                     File.separator + context.getString(R.string.app_name)
-            )
+            val destDir = if (preferences.folderPerManga()) {
+                File(baseDir + File.separator + DiskUtil.buildValidFilename(manga.title))
+            } else {
+                File(baseDir)
+            }
 
             try {
                 val file = saveImages(firstPage, secondPage, isLTR, bg, destDir, manga)