diff --git a/src/renderer/components/ChannelHome/ChannelHome.css b/src/renderer/components/ChannelHome/ChannelHome.css
index 8c7bb1eb40b0b..60cc9429d5ee8 100644
--- a/src/renderer/components/ChannelHome/ChannelHome.css
+++ b/src/renderer/components/ChannelHome/ChannelHome.css
@@ -1,6 +1,11 @@
+.shelfContainer {
+  max-inline-size: 85vw;
+}
+
 .shelfTitle {
   font-size: 24px;
   cursor: pointer;
+  overflow-wrap: break-word;
 }
 
 .shelfTitle::marker {
diff --git a/src/renderer/components/ChannelHome/ChannelHome.vue b/src/renderer/components/ChannelHome/ChannelHome.vue
index 4c5a11326f0a5..97b65aa561ec7 100644
--- a/src/renderer/components/ChannelHome/ChannelHome.vue
+++ b/src/renderer/components/ChannelHome/ChannelHome.vue
@@ -3,6 +3,7 @@
     <div
       v-for="(shelf, index) in filteredShelves"
       :key="index"
+      class="shelfContainer"
     >
       <details
         open
diff --git a/src/renderer/components/PlaylistInfo/PlaylistInfo.scss b/src/renderer/components/PlaylistInfo/PlaylistInfo.scss
index cecb8510bbf1e..b3d9ebcec6b66 100644
--- a/src/renderer/components/PlaylistInfo/PlaylistInfo.scss
+++ b/src/renderer/components/PlaylistInfo/PlaylistInfo.scss
@@ -27,6 +27,7 @@
 
 .playlistTitle {
   margin-block-end: 0.1em;
+  overflow-wrap: break-word;
 }
 
 .playlistDescription {
diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index 7e8465835ea96..6e9d768f4573a 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -85,6 +85,10 @@
       padding: 10px;
     }
   }
+
+  .playlistPage {
+    inline-size: 85vw;
+  }
 }