diff --git a/ModAssistant/Classes/Themes.cs b/ModAssistant/Classes/Themes.cs
index 56131b6..4b57135 100644
--- a/ModAssistant/Classes/Themes.cs
+++ b/ModAssistant/Classes/Themes.cs
@@ -127,7 +127,7 @@ namespace ModAssistant
                     if (!sendMessage || MainWindow.Instance.BackgroundVideo.Source?.AbsoluteUri != videoUri.AbsoluteUri)
                     {
                         MainWindow.Instance.BackgroundVideo.Stop();
-                        MainWindow.Instance.BackgroundVideoSource.Source = videoUri;
+                        MainWindow.Instance.BackgroundVideo.Source = videoUri;
                     }
                     MainWindow.Instance.BackgroundVideo.Play();
                 }
diff --git a/ModAssistant/MainWindow.xaml b/ModAssistant/MainWindow.xaml
index 7e70a8f..5a11a66 100644
--- a/ModAssistant/MainWindow.xaml
+++ b/ModAssistant/MainWindow.xaml
@@ -16,19 +16,7 @@
                 <ImageBrush x:Name="BackgroundImage" Stretch="{DynamicResource BackgroundImageStretch}"/>
             </Rectangle.Fill>
         </Rectangle>
-        <MediaElement Visibility="Hidden" LoadedBehavior="Manual" Name="BackgroundVideo">
-            <MediaElement.Triggers>
-                <EventTrigger RoutedEvent="MediaElement.Loaded">
-                    <EventTrigger.Actions>
-                        <BeginStoryboard>
-                            <Storyboard>
-                                <MediaTimeline Name="BackgroundVideoSource" Storyboard.TargetName="BackgroundVideo" RepeatBehavior="Forever"/>
-                            </Storyboard>
-                        </BeginStoryboard>
-                    </EventTrigger.Actions>
-                </EventTrigger>
-            </MediaElement.Triggers>
-        </MediaElement>
+        <MediaElement Visibility="Hidden" LoadedBehavior="Manual" Name="BackgroundVideo" MediaEnded="BackgroundVideo_MediaEnded"/>
         <Image x:Name="SideImage" UseLayoutRounding="True" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="{DynamicResource SideImageYPosition}"  Width="{Binding RelativeSource={RelativeSource Self}, Path=Source.PixelWidth}" Height="{Binding RelativeSource={RelativeSource Self}, Path=Source.PixelHeight}" Stretch="Fill"/>
         <Grid Margin="10">
             <Grid.RowDefinitions>
diff --git a/ModAssistant/MainWindow.xaml.cs b/ModAssistant/MainWindow.xaml.cs
index b88fd23..e24a75d 100644
--- a/ModAssistant/MainWindow.xaml.cs
+++ b/ModAssistant/MainWindow.xaml.cs
@@ -303,5 +303,11 @@ namespace ModAssistant
                 Mods.Instance.RefreshColumns();
             }
         }
+
+        private void BackgroundVideo_MediaEnded(object sender, RoutedEventArgs e)
+        {
+            BackgroundVideo.Position = TimeSpan.Zero;
+            BackgroundVideo.Play();
+        }
     }
 }