diff --git a/app/src/main/kotlin/com/subtracks/ui/library/ArtistsContent.kt b/app/src/main/kotlin/com/subtracks/ui/library/ArtistsContent.kt
index 7cb6ca98..88f96fee 100644
--- a/app/src/main/kotlin/com/subtracks/ui/library/ArtistsContent.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/library/ArtistsContent.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
@@ -48,8 +49,20 @@ fun ArtistsContent(
                     val artist = items[index]
                     if (artist != null) {
                         ListItem(
-                            headlineContent = { Text(artist.name) },
-                            supportingContent = { Text("${artist.albumCount} albums") },
+                            headlineContent = {
+                                Text(
+                                    text = artist.name,
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                            },
+                            supportingContent = {
+                                Text(
+                                    text = "${artist.albumCount} albums",
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                            },
                             leadingContent = {
                                 CoverArt(
                                     ref = coverArt(artist.coverArt, true),
diff --git a/app/src/main/kotlin/com/subtracks/ui/library/PlaylistsContent.kt b/app/src/main/kotlin/com/subtracks/ui/library/PlaylistsContent.kt
index 8e3eabd9..b97e4549 100644
--- a/app/src/main/kotlin/com/subtracks/ui/library/PlaylistsContent.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/library/PlaylistsContent.kt
@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
@@ -50,9 +51,19 @@ fun PlaylistsContent(
                     val playlist = items[index]
                     if (playlist != null) {
                         ListItem(
-                            headlineContent = { Text(playlist.name) },
+                            headlineContent = {
+                                Text(
+                                    text = playlist.name,
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                            },
                             supportingContent = {
-                                Text(playlist.comment?.takeIf { it.isNotBlank() } ?: "${playlist.songCount} songs")
+                                Text(
+                                    text = playlist.comment?.takeIf { it.isNotBlank() } ?: "${playlist.songCount} songs",
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
                             },
                             leadingContent = {
                                 CoverArt(