diff --git a/src/renderer/components/ChannelHome/ChannelHome.css b/src/renderer/components/ChannelHome/ChannelHome.css
index 60cc9429d5ee8..696200e3a5e14 100644
--- a/src/renderer/components/ChannelHome/ChannelHome.css
+++ b/src/renderer/components/ChannelHome/ChannelHome.css
@@ -5,7 +5,10 @@
 .shelfTitle {
   font-size: 24px;
   cursor: pointer;
-  overflow-wrap: break-word;
+
+  /* Prevents overflow for long values */
+  max-inline-size: 100%;
+  overflow-wrap: anywhere;
 }
 
 .shelfTitle::marker {
@@ -37,4 +40,8 @@
 .shelfSubtitle {
   font-style: italic;
   color: var(--tertiary-text-color);
+
+  /* Prevents overflow for long values */
+  max-inline-size: 100%;
+  overflow-wrap: anywhere;
 }
diff --git a/src/renderer/components/PlaylistInfo/PlaylistInfo.scss b/src/renderer/components/PlaylistInfo/PlaylistInfo.scss
index b3d9ebcec6b66..04c9ffef8b410 100644
--- a/src/renderer/components/PlaylistInfo/PlaylistInfo.scss
+++ b/src/renderer/components/PlaylistInfo/PlaylistInfo.scss
@@ -27,7 +27,18 @@
 
 .playlistTitle {
   margin-block-end: 0.1em;
-  overflow-wrap: break-word;
+
+  /* Prevents overflow for long values */
+  overflow-wrap: anywhere;
+
+  @media only screen and (width <= 850px) {
+    // margin-inline-in routerView = 8px x2 = 16px
+    // For unknown reason class `routerView` is in 2 containers
+    // padding for `playlistInfo` is 10px x2 = 20px
+    // Also scrollbar got unknown width so using 95vw instead of 100vw
+    max-inline-size: calc(95vw - 32px - 20px);
+    text-overflow: ellipsis;
+  }
 }
 
 .playlistDescription {
@@ -100,7 +111,6 @@
   .playlistDescription {
     overflow-x: hidden;
     text-align: center;
-    white-space: nowrap;
     text-overflow: ellipsis;
     max-inline-size: 750px;
     inline-size: 100%;
diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss
index 6e9d768f4573a..e784d7782493c 100644
--- a/src/renderer/views/Playlist/Playlist.scss
+++ b/src/renderer/views/Playlist/Playlist.scss
@@ -67,12 +67,13 @@
   }
 
   &.list {
+    gap: 1em;
+
     .playlistInfoContainer {
       background-color: var(--card-bg-color);
       block-size: calc(100vh - 132px);
       inline-size: 30%;
       inset-block-start: 96px;
-      margin-inline-end: 1em;
       position: sticky;
 
       .playlistInfo {
@@ -85,10 +86,6 @@
       padding: 10px;
     }
   }
-
-  .playlistPage {
-    inline-size: 85vw;
-  }
 }
 
 
@@ -143,12 +140,16 @@
     flex-direction: column;
 
     &.list {
+      gap: 0;
+
       .playlistInfoContainer {
         box-sizing: border-box;
         position: relative;
         inset-block-start: 0;
         block-size: auto;
         inline-size: 100%;
+        // Reset margin
+        margin-inline-end: 0;
       }
 
       .playlistItemsCard {