diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index e6b1f736..2d08d881 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -321,29 +321,37 @@
                         android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
                         android:textSize="18sp" />
 
-                    <LinearLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/next_up"
-                        android:layout_width="match_parent"
+                        android:layout_width="@dimen/nextup_media_width"
                         android:layout_height="wrap_content"
                         android:layout_marginHorizontal="24dp"
                         android:foreground="?attr/selectableItemBackground"
                         android:orientation="vertical">
 
                         <com.google.android.material.imageview.ShapeableImageView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="4dp"
+                            android:id="@+id/next_up_image"
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
                             android:adjustViewBounds="true"
                             app:itemPrimaryImage="@{viewModel.nextUp}"
+                            app:layout_constraintDimensionRatio="H,16:9"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
                             app:shapeAppearance="@style/roundedImageView" />
 
                         <TextView
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
                             android:text="@{String.format(@string/episode_name_extended, viewModel.nextUp.parentIndexNumber, viewModel.nextUp.indexNumber, viewModel.nextUp.name)}"
                             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/next_up_image"
                             tools:text="The Girl Flautist" />
-                    </LinearLayout>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 00a41b89..c75a4667 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -5,4 +5,5 @@
     <item name="collection_columns" type="integer">2</item>
     <item name="library_columns" type="integer">4</item>
     <item name="recyclerview_animation_duration" type="integer">450</item>
+    <dimen name="nextup_media_width">350dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 67e4c067..6ad4fb71 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,4 +8,5 @@
     <item name="collection_columns" type="integer">1</item>
     <item name="library_columns" type="integer">2</item>
     <item name="recyclerview_animation_duration" type="integer">250</item>
+    <dimen name="nextup_media_width">@dimen/match_parent</dimen>
 </resources>
\ No newline at end of file