diff --git a/app/src/main/java/org/schabi/newpipe/util/PlayButtonHelper.java b/app/src/main/java/org/schabi/newpipe/util/PlayButtonHelper.java
index 9727c808300..655ea7092f2 100644
--- a/app/src/main/java/org/schabi/newpipe/util/PlayButtonHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/PlayButtonHelper.java
@@ -50,6 +50,10 @@ public static void initPlaylistControlClickListener(
         });
 
         // long click listener
+        playlistControlBinding.playlistCtrlPlayAllButton.setOnLongClickListener(view -> {
+            NavigationHelper.enqueueOnPlayer(activity, fragment.getPlayQueue(), PlayerType.MAIN);
+            return true;
+        });
         playlistControlBinding.playlistCtrlPlayPopupButton.setOnLongClickListener(view -> {
             NavigationHelper.enqueueOnPlayer(activity, fragment.getPlayQueue(), PlayerType.POPUP);
             return true;
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 99b514bb090..3451ea93d72 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -166,6 +166,9 @@
                         android:background="?attr/selectableItemBackground"
                         android:gravity="center"
                         android:minWidth="0dp"
+                        android:maxWidth="120dp"
+                        android:ellipsize="end"
+                        android:singleLine="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:textColor="@android:color/white"
                         android:textStyle="bold"
@@ -182,6 +185,9 @@
                         android:background="?attr/selectableItemBackground"
                         android:gravity="center"
                         android:minWidth="0dp"
+                        android:maxWidth="80dp"
+                        android:ellipsize="end"
+                        android:singleLine="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:textColor="@android:color/white"
                         android:textStyle="bold"
@@ -196,6 +202,9 @@
                         android:background="?attr/selectableItemBackgroundBorderless"
                         android:gravity="center"
                         android:minWidth="0dp"
+                        android:maxWidth="60dp"
+                        android:ellipsize="end"
+                        android:singleLine="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:textColor="@android:color/white"
                         android:textStyle="bold"
@@ -273,6 +282,9 @@
                         android:background="?attr/selectableItemBackground"
                         android:gravity="center"
                         android:minWidth="50dp"
+                        android:maxWidth="80dp"
+                        android:ellipsize="end"
+                        android:singleLine="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:textColor="@android:color/white"
                         android:textStyle="bold"