diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt
index 02c1f46768..ab714f43ab 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaHeaderHolder.kt
@@ -157,15 +157,17 @@ class MangaHeaderHolder(
             visibleIf(nextChapter != null && !item.isLocked)
             if (nextChapter != null) {
                 val number = adapter.decimalFormat.format(nextChapter.chapter_number.toDouble())
-                text = resources.getString(
-                    when {
-                        nextChapter.last_page_read > 0 && nextChapter.chapter_number <= 0 ->
-                            R.string.continue_reading
-                        nextChapter.chapter_number <= 0 -> R.string.start_reading
-                        nextChapter.last_page_read > 0 -> R.string.continue_reading_chapter
-                        else -> R.string.start_reader_chapter
-                    }, number
+                text = if (nextChapter.chapter_number > 0) resources.getString(
+                    if (nextChapter.last_page_read > 0) R.string.continue_reading_chapter
+                    else R.string.start_reading_chapter, number
                 )
+                else {
+                    val name = nextChapter.name
+                    resources.getString(
+                        if (nextChapter.last_page_read > 0) R.string.continue_reading_x
+                        else R.string.start_reading_x, name
+                    )
+                }
             }
         }
 
@@ -173,7 +175,7 @@ class MangaHeaderHolder(
         chapters_title.text = itemView.resources.getQuantityString(R.plurals.chapters, count, count)
 
         top_view.updateLayoutParams<ConstraintLayout.LayoutParams> {
-            height = adapter.coverListener.topCoverHeight() ?: 0
+            height = adapter.coverListener.topCoverHeight()
         }
 
         manga_status.text = (itemView.context.getString( when (manga.status) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 510671c57a..de516fde15 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -515,7 +515,9 @@
 
     <!-- Manga chapters fragment -->
     <string name="start_reading">Start reading</string>
-    <string name="start_reader_chapter">Start reading Chapter %1$s</string>
+    <string name="start_reading_x">Start reading %1$s</string>
+    <string name="continue_reading_x">Continue reading %1$s</string>
+    <string name="start_reading_chapter">Start reading Chapter %1$s</string>
     <string name="continue_reading_chapter">Continue reading Chapter %1$s</string>
     <string name="continue_reading">Continue reading</string>
     <string name="manga_chapters_tab">Chapters</string>