diff --git a/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt
index dbe718a90a..29cf3a967d 100644
--- a/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/DownloadsAdapter.kt
@@ -21,6 +21,7 @@ import com.github.libretube.helpers.ImageHelper
 import com.github.libretube.helpers.NavigationHelper
 import com.github.libretube.ui.activities.OfflinePlayerActivity
 import com.github.libretube.ui.base.BaseActivity
+import com.github.libretube.ui.extensions.setWatchProgressLength
 import com.github.libretube.ui.fragments.DownloadTab
 import com.github.libretube.ui.sheets.DownloadOptionsBottomSheet
 import com.github.libretube.ui.sheets.DownloadOptionsBottomSheet.Companion.DELETE_DOWNLOAD_REQUEST_KEY
@@ -56,6 +57,7 @@ class DownloadsAdapter(
             title.text = download.title
             uploaderName.text = download.uploader
             videoInfo.text = download.uploadDate?.let { TextUtils.localizeDate(it) }
+            watchProgress.setWatchProgressLength(download.videoId, download.duration ?: 0)
 
             val downloadSize = items.sumOf { it.downloadSize }
             val currentSize = items.filter { it.path.exists() }.sumOf { it.path.fileSize() }
diff --git a/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt b/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
index b396279fff..22912cb4a6 100644
--- a/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
+++ b/app/src/main/java/com/github/libretube/ui/extensions/SetWatchProgressLength.kt
@@ -31,21 +31,21 @@ fun View.setWatchProgressLength(videoId: String, duration: Long) {
     setBackgroundColor(backgroundColor)
     isGone = true
 
-    val progress = try {
+    if (duration == 0L) {
+        return
+    }
+
+    val progress = runCatching {
         runBlocking {
             Database.watchPositionDao().findById(videoId)?.position
+                // divide by 1000 to convert ms to seconds
+                ?.toFloat()?.div(1000)
         }
-    } catch (e: Exception) {
-        return
-    } // divide by 1000 to convert ms to seconds
-        ?.toFloat()?.div(1000)
-
-    if (progress == null || duration == 0L) {
-        return
-    }
+    }.getOrNull() ?: return
 
     updateLayoutParams<ConstraintLayout.LayoutParams> {
         matchConstraintPercentWidth = progress / duration.toFloat()
     }
+
     isVisible = true
 }
diff --git a/app/src/main/res/layout/downloaded_media_row.xml b/app/src/main/res/layout/downloaded_media_row.xml
index 68e3666ccb..29d3f1b992 100644
--- a/app/src/main/res/layout/downloaded_media_row.xml
+++ b/app/src/main/res/layout/downloaded_media_row.xml
@@ -16,66 +16,83 @@
         android:layout_marginEnd="15dp"
         app:cardCornerRadius="8dp">
 
-        <ImageView
-            android:id="@+id/thumbnailImage"
-            android:layout_width="150dp"
-            android:layout_height="83dp"
-            android:scaleType="fitXY"
-            tools:src="@tools:sample/backgrounds/scenic" />
-
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/durationContainer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="5dp"
-            android:visibility="gone"
-            app:cardBackgroundColor="@color/duration_background_color"
-            app:cardCornerRadius="8dp"
-            app:cardElevation="0dp"
-            app:layout_constraintBottom_toBottomOf="@id/thumbnailImage"
-            tools:visibility="visible">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
-            <TextView
-                android:id="@+id/thumbnail_duration"
+            <ImageView
+                android:id="@+id/thumbnailImage"
+                android:layout_width="150dp"
+                android:layout_height="83dp"
+                android:scaleType="fitXY"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:src="@tools:sample/backgrounds/scenic" />
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/durationContainer"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="6dp"
-                android:paddingVertical="2dp"
-                android:textColor="@color/duration_text_color"
-                android:textSize="11sp"
-                tools:text="05:36" />
-
-        </androidx.cardview.widget.CardView>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/downloadOverlay"
-            android:layout_width="150dp"
-            android:layout_height="83dp"
-            android:background="#BF000000">
-
-            <ProgressBar
-                android:id="@+id/progressBar"
-                android:layout_width="52dp"
-                android:layout_height="52dp"
-                android:indeterminateOnly="false"
-                android:progressDrawable="@drawable/circular_progress"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginEnd="5dp"
+                android:layout_marginBottom="5dp"
+                android:visibility="gone"
+                app:cardBackgroundColor="@color/duration_background_color"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="0dp"
+                app:layout_constraintBottom_toBottomOf="@id/thumbnailImage"
+                tools:visibility="visible">
+
+                <TextView
+                    android:id="@+id/thumbnail_duration"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="6dp"
+                    android:paddingVertical="2dp"
+                    android:textColor="@color/duration_text_color"
+                    android:textSize="11sp"
+                    tools:text="05:36" />
+
+            </androidx.cardview.widget.CardView>
+
+            <View
+                android:id="@+id/watch_progress"
+                style="@style/WatchProgress"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                tools:visibility="visible"
+                tools:layout_width="20dp" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/downloadOverlay"
+                android:layout_width="150dp"
+                android:layout_height="83dp"
+                android:background="#BF000000"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <ProgressBar
+                    android:id="@+id/progressBar"
+                    android:layout_width="52dp"
+                    android:layout_height="52dp"
+                    android:indeterminateOnly="false"
+                    android:progressDrawable="@drawable/circular_progress"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/resumePauseBtn"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:src="@drawable/ic_download"
+                    app:layout_constraintBottom_toBottomOf="@id/progressBar"
+                    app:layout_constraintLeft_toLeftOf="@id/progressBar"
+                    app:layout_constraintRight_toRightOf="@id/progressBar"
+                    app:layout_constraintTop_toTopOf="@id/progressBar" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <ImageView
-                android:id="@+id/resumePauseBtn"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:src="@drawable/ic_download"
-                app:layout_constraintBottom_toBottomOf="@id/progressBar"
-                app:layout_constraintLeft_toLeftOf="@id/progressBar"
-                app:layout_constraintRight_toRightOf="@id/progressBar"
-                app:layout_constraintTop_toTopOf="@id/progressBar" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.card.MaterialCardView>
@@ -120,7 +137,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="13sp"
-                tools:text="13.13MB"/>
+                tools:text="13.13MB" />
 
         </LinearLayout>