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 cdb030f1b..82d117da6 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
@@ -578,8 +578,9 @@ class ReaderPresenter : BasePresenter<ReaderActivity>() {
 
                     // Build destination file.
                     val ext = MimeTypeMap.getSingleton().getExtensionFromMimeType(mime) ?: "jpg"
-                    val filename = "${manga.title} - ${chapter.name} - ${page.index + 1}"
-                    val destFile = File(destDir, DiskUtil.buildValidFilename(filename) + ".$ext")
+                    val filename = DiskUtil.buildValidFilename(
+                            "${manga.title} - ${chapter.name}") + " - ${page.index + 1}.$ext"
+                    val destFile = File(destDir, filename)
 
                     context.contentResolver.openInputStream(page.uri).use { input ->
                         destFile.outputStream().use { output ->
diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt
index b3e3acda2..fa775183d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/DiskUtil.kt
@@ -50,8 +50,8 @@ object DiskUtil {
             }
         }
         // Even though vfat allows 255 UCS-2 chars, we might eventually write to
-        // ext4 through a FUSE layer, so use that limit minus 5 reserved characters.
-        return sb.toString().take(250)
+        // ext4 through a FUSE layer, so use that limit minus 15 reserved characters.
+        return sb.toString().take(240)
     }
 
     /**