diff --git a/MediaFeeder/MediaFeeder/Components/Pages/Home.razor b/MediaFeeder/MediaFeeder/Components/Pages/Home.razor
index 7d5e9f4..482f870 100644
--- a/MediaFeeder/MediaFeeder/Components/Pages/Home.razor
+++ b/MediaFeeder/MediaFeeder/Components/Pages/Home.razor
@@ -95,7 +95,7 @@
             </Tooltip>
 
             <Button Icon="@(IconType.Outline.ClockCircle)">
-                @Duration.Humanize()
+                @Duration.Humanize(2)
             </Button>
 
             <Tooltip Title="Shuffle">
diff --git a/MediaFeeder/MediaFeeder/Components/Pages/Video.razor b/MediaFeeder/MediaFeeder/Components/Pages/Video.razor
index eebbde1..3844c11 100644
--- a/MediaFeeder/MediaFeeder/Components/Pages/Video.razor
+++ b/MediaFeeder/MediaFeeder/Components/Pages/Video.razor
@@ -25,9 +25,9 @@
             </TitleTemplate>
             <SubtitleTemplate>
                 <span class="ant-page-header-heading-sub-title">
-                    <a href="@($"/folder/{VideoObject?.Subscription?.ParentFolder?.Id}")">@VideoObject?.Subscription?.ParentFolder.Name</a>
+                    <a href="@($"/folder/{VideoObject?.Subscription.ParentFolder?.Id}")">@VideoObject?.Subscription.ParentFolder?.Name</a>
                     &gt;
-                    <a href="@($"/subscription/{VideoObject?.Subscription?.Id}")">@VideoObject?.Subscription?.Name</a>
+                    <a href="@($"/subscription/{VideoObject?.Subscription.Id}")">@VideoObject?.Subscription.Name</a>
                 </span>
             </SubtitleTemplate>
 
@@ -79,14 +79,14 @@
                 @if (Next != null)
                 {
                     <Tooltip Title="Remaining">
-                        <Button>@UpNextCount, @UpNextDuration.Humanize()</Button>
+                        <Button>@UpNextCount, @TotalDuration.Humanize(2)</Button>
                     </Tooltip>
                 }
             </div>
         </PageHeaderExtra>
     </PageHeader>
     <Content>
-        @if (VideoObject != null && Provider != null)
+        @if (VideoObject != null && Provider != null && PlaybackSession != null)
         {
             <DynamicComponent
                 Type="@Provider.VideoFrameView"
diff --git a/MediaFeeder/MediaFeeder/Components/Pages/Video.razor.cs b/MediaFeeder/MediaFeeder/Components/Pages/Video.razor.cs
index 5d32c47..a6d00c9 100644
--- a/MediaFeeder/MediaFeeder/Components/Pages/Video.razor.cs
+++ b/MediaFeeder/MediaFeeder/Components/Pages/Video.razor.cs
@@ -30,6 +30,7 @@ public sealed partial class Video : IDisposable
 
     private int UpNextCount { get; set; }
     private TimeSpan UpNextDuration { get; set; }
+    private TimeSpan TotalDuration { get; set; }
 
     protected override async Task OnParametersSetAsync()
     {
@@ -60,13 +61,27 @@ protected override async Task OnParametersSetAsync()
             UpNextCount = more.Count;
             UpNextDuration = TimeSpan.FromSeconds(Context.Videos.Where(v => more.Contains(v.Id)).Sum(static v => v.Duration));
         }
+        else
+        {
+            UpNextDuration = TimeSpan.Zero;
+        }
 
         PlaybackSession.Video = VideoObject;
         PlaybackSession.Provider = Provider.Provider;
+        PlaybackSession.UpdateEvent += UpdateTimestamp;
 
+        UpdateTimestamp();
         StateHasChanged();
     }
 
+    private void UpdateTimestamp()
+    {
+        var remaining = VideoObject?.DurationSpan - PlaybackSession?.CurrentPosition;
+        TotalDuration = UpNextDuration + (remaining ?? TimeSpan.Zero);
+
+        InvokeAsync(StateHasChanged);
+    }
+
     private async Task MarkWatched()
     {
         ArgumentNullException.ThrowIfNull(VideoObject);