diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
index 2e9a15d7dac..03626d5f2a4 100644
--- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
+++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java
@@ -132,6 +132,10 @@ public String getUploader() {
         return uploader;
     }
 
+    public String getShortedUploaderName() {
+        return uploader.substring(0, Math.min(uploader.length(), 35)) + "...";
+    }
+
     public void setUploader(final String uploader) {
         this.uploader = uploader;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
index a39e3cecb5b..f3b897c61b9 100644
--- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
@@ -38,7 +38,7 @@ public void updateFromItem(final LocalItem localItem,
                 itemStreamCountView.getContext(), item.getStreamCount()));
         // Here is where the uploader name is set in the bookmarked playlists library
         if (!TextUtils.isEmpty(item.getUploader())) {
-            itemUploaderView.setText(Localization.concatenateStrings(item.getUploader(),
+            itemUploaderView.setText(Localization.concatenateStrings(item.getShortedUploaderName(),
                     NewPipe.getNameOfService(item.getServiceId())));
         } else {
             itemUploaderView.setText(NewPipe.getNameOfService(item.getServiceId()));