diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 778523475..ce7aadf54 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -83,9 +83,7 @@ limitations under the License.
 
         <activity android:name=".TrackEditActivity" />
 
-        <activity
-            android:name=".TrackListActivity"
-            android:screenOrientation="userPortrait">
+        <activity android:name=".TrackListActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/src/main/res/layout-land/track_list.xml b/src/main/res/layout-land/track_list.xml
index 13276df88..fa4ff1aa3 100644
--- a/src/main/res/layout-land/track_list.xml
+++ b/src/main/res/layout-land/track_list.xml
@@ -17,80 +17,87 @@ limitations under the License.
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
-    android:orientation="horizontal">
+    android:orientation="vertical">
 
     <include layout="@layout/toolbar" />
 
-    <include layout="@layout/track_controller" />
-
-    <ListView
-        android:id="@+id/track_list"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1.0" />
+        android:baselineAligned="false"
+        android:orientation="horizontal">
 
-    <RelativeLayout
-        android:id="@+id/track_list_empty_view"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1.0">
+        <include layout="@layout/track_controller" />
 
-        <LinearLayout
-            android:id="@+id/track_list_arrow_long"
-            android:layout_width="wrap_content"
+        <ListView
+            android:id="@+id/track_list"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:orientation="vertical"
-            android:paddingLeft="12dp"
-            android:paddingRight="16dp">
+            android:layout_weight="1.0" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+        <RelativeLayout
+            android:id="@+id/track_list_empty_view"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1.0">
 
-            <ImageView
+            <LinearLayout
+                android:id="@+id/track_list_arrow_long"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_weight="10"
-                android:contentDescription="@string/image_arrow"
-                android:src="@drawable/ic_arrow_long" />
+                android:layout_height="match_parent"
+                android:layout_alignParentLeft="true"
+                android:orientation="vertical"
+                android:paddingLeft="12dp"
+                android:paddingRight="16dp">
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="17" />
-        </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_toRightOf="@id/track_list_arrow_long"
-            android:orientation="vertical">
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="0dp"
+                    android:layout_weight="10"
+                    android:contentDescription="@string/image_arrow"
+                    android:src="@drawable/ic_arrow_long" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="4" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="17" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="24">
-
-                <TextView
-                    style="@style/TextLarge"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight=".7"
-                    android:text="@string/track_list_empty_message"
-                    android:textColor="@color/list_empty_text" />
+                android:layout_height="match_parent"
+                android:layout_toRightOf="@id/track_list_arrow_long"
+                android:orientation="vertical">
 
                 <View
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight=".3" />
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="4" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="24">
+
+                    <TextView
+                        style="@style/TextLarge"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight=".7"
+                        android:text="@string/track_list_empty_message"
+                        android:textColor="@color/list_empty_text" />
+
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight=".3" />
+                </LinearLayout>
             </LinearLayout>
-        </LinearLayout>
-    </RelativeLayout>
+        </RelativeLayout>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file