diff --git a/CHANGELOG.md b/CHANGELOG.md
index b40637a26..eb55f7425 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - Default error background is now named `_background.png`
   - Error streams will prioritize using `background.png` if it exists
     - Replacing this `background.png` file will allow custom error/offline backgrounds
+- Add `Troubleshoot Playback` buttons on movie and episode detail pages
 
 ### Fixed
 - Fix HLS Direct playback with Jellyfin 10.11
diff --git a/ErsatzTV/Pages/Movie.razor b/ErsatzTV/Pages/Movie.razor
index e26486ce4..0049a98cb 100644
--- a/ErsatzTV/Pages/Movie.razor
+++ b/ErsatzTV/Pages/Movie.razor
@@ -66,24 +66,26 @@
                 </MudCard>
             }
             <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown" Class="mb-6">
-                <MudButton Variant="Variant.Filled"
-                           Color="Color.Primary"
-                           StartIcon="@Icons.Material.Filled.Add"
-                           OnClick="@AddToCollection">
-                    Add To Collection
-                </MudButton>
-                <MudButton Variant="Variant.Filled"
-                           Color="Color.Primary"
-                           StartIcon="@Icons.Material.Filled.PlaylistAdd"
-                           OnClick="@AddToPlaylist">
-                    Add To Playlist
-                </MudButton>
+                <MudMenu Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Add" Label="Add To ...">
+                    <MudMenuItem OnClick="@AddToCollection" Icon="@Icons.Material.Filled.Add">
+                        Add To Collection
+                    </MudMenuItem>
+                    <MudMenuItem OnClick="@AddToPlaylist" Icon="@Icons.Material.Filled.PlaylistAdd">
+                        Add To Playlist
+                    </MudMenuItem>
+                </MudMenu>
                 <MudButton Variant="Variant.Filled"
                            Color="Color.Secondary"
                            StartIcon="@Icons.Material.Filled.Info"
                            OnClick="@ShowInfo">
                     Show Media Info
                 </MudButton>
+                <MudButton Variant="Variant.Filled"
+                           Color="Color.Secondary"
+                           StartIcon="@Icons.Material.Filled.Troubleshoot"
+                           Href="@($"system/troubleshooting/playback?mediaItem={MovieId}")">
+                    Troubleshoot Playback
+                </MudButton>
             </MudStack>
         </div>
     </MudStack>
diff --git a/ErsatzTV/Pages/TelevisionEpisodeList.razor b/ErsatzTV/Pages/TelevisionEpisodeList.razor
index 916082714..6c71191d6 100644
--- a/ErsatzTV/Pages/TelevisionEpisodeList.razor
+++ b/ErsatzTV/Pages/TelevisionEpisodeList.razor
@@ -102,24 +102,26 @@
                             <MudText Typo="Typo.h4" Class="mb-6">@episode.Episode. @episode.Title</MudText>
                             <MudText Class="d-none d-md-flex" Style="flex-grow: 1">@episode.Plot</MudText>
                             <MudStack Row="true" Breakpoint="Breakpoint.SmAndDown">
-                                <MudButton Variant="Variant.Filled"
-                                           Color="Color.Primary"
-                                           StartIcon="@Icons.Material.Filled.Add"
-                                           OnClick="@(_ => AddEpisodeToCollection(episode))">
-                                    Add To Collection
-                                </MudButton>
-                                <MudButton Variant="Variant.Filled"
-                                           Color="Color.Primary"
-                                           StartIcon="@Icons.Material.Filled.PlaylistAdd"
-                                           OnClick="@(_ => AddEpisodeToPlaylist(episode))">
-                                    Add To Playlist
-                                </MudButton>
+                                <MudMenu Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Add" Label="Add To ...">
+                                    <MudMenuItem OnClick="@(_ => AddEpisodeToCollection(episode))" Icon="@Icons.Material.Filled.Add">
+                                        Add To Collection
+                                    </MudMenuItem>
+                                    <MudMenuItem OnClick="@(_ => AddEpisodeToPlaylist(episode))" Icon="@Icons.Material.Filled.PlaylistAdd">
+                                        Add To Playlist
+                                    </MudMenuItem>
+                                </MudMenu>
                                 <MudButton Variant="Variant.Filled"
                                            Color="Color.Secondary"
                                            StartIcon="@Icons.Material.Filled.Info"
                                            OnClick="@(_ => ShowInfo(episode))">
                                     Show Media Info
                                 </MudButton>
+                                <MudButton Variant="Variant.Filled"
+                                           Color="Color.Secondary"
+                                           StartIcon="@Icons.Material.Filled.Troubleshoot"
+                                           Href="@($"system/troubleshooting/playback?mediaItem={episode.EpisodeId}")">
+                                    Troubleshoot Playback
+                                </MudButton>
                             </MudStack>
                         </div>
                     </MudCardContent>