diff --git a/demos/main/src/main/res/layout/track_selection_dialog_tab.xml b/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
index 1827b4738b..33e69e5bee 100644
--- a/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
+++ b/demos/main/src/main/res/layout/track_selection_dialog_tab.xml
@@ -16,9 +16,10 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
+
   <com.google.android.exoplayer2.ui.TrackSelectionView
       android:id="@+id/download_dialog_track_selection_view"
-      android:orientation="vertical"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"/>
+
 </ScrollView>
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
index e95d70f026..7af1a905ef 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
@@ -87,6 +87,8 @@ public class TrackSelectionView extends LinearLayout {
   public TrackSelectionView(
       Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) {
     super(context, attrs, defStyleAttr);
+    setOrientation(LinearLayout.VERTICAL);
+
     overrides = new SparseArray<>();
 
     // Don't save view hierarchy as it needs to be reinitialized with a call to init.
diff --git a/library/ui/src/main/res/layout/exo_track_selection_dialog.xml b/library/ui/src/main/res/layout/exo_track_selection_dialog.xml
index 2ad8e2ea9b..07f59c3a59 100644
--- a/library/ui/src/main/res/layout/exo_track_selection_dialog.xml
+++ b/library/ui/src/main/res/layout/exo_track_selection_dialog.xml
@@ -18,7 +18,6 @@
     android:layout_height="match_parent">
 
   <com.google.android.exoplayer2.ui.TrackSelectionView android:id="@+id/exo_track_selection_view"
-      android:orientation="vertical"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"/>