diff --git a/app/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailScaffold.kt b/app/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailScaffold.kt
index 169ee7ef..f7bb9b04 100644
--- a/app/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailScaffold.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailScaffold.kt
@@ -220,6 +220,8 @@ private fun ColumnScope.MediaDetailScaffoldContent(
             color = scheme.onBackground,
             fontSize = uiModel.subtitleFontSize,
             fontWeight = uiModel.subtitleFontWeight,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
             modifier = modifier
         )
     }
diff --git a/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt b/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
index eb7f766d..d370c51d 100644
--- a/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
+++ b/app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
@@ -250,9 +250,14 @@ private fun Series.toMediaDetailScaffoldUiModel(
     metadataItems = listOf(year, "$seasonCount Seasons"),
     actions = selectedSeason?.let {
         val seriesWatched = unwatchedEpisodeCount == 0
+        val playButtonText = mediaPlayButtonText(nextUpEpisode?.progress, nextUpEpisode?.watched)
         MediaDetailActionsUiModel(
             primaryAction = MediaDetailPrimaryActionUiModel(
-                text = mediaPlayButtonText(nextUpEpisode?.progress, nextUpEpisode?.watched),
+                text = if (nextUpEpisode != null) {
+                    "$playButtonText S${it.index} • E${nextUpEpisode.index}"
+                } else {
+                    playButtonText
+                },
                 progress = mediaPlaybackProgress(nextUpEpisode?.progress),
                 onClick = onPlayClick,
                 testTag = SeriesPlayButtonTag