diff --git a/SentryReplay.Tests/MainWindowViewModelTests.cs b/SentryReplay.Tests/MainWindowViewModelTests.cs
index c6ae510..2833110 100644
--- a/SentryReplay.Tests/MainWindowViewModelTests.cs
+++ b/SentryReplay.Tests/MainWindowViewModelTests.cs
@@ -279,22 +279,22 @@ public void DismissError_ClearsErrorState()
     // --- Clip browsing: the injectable clip loader lets us populate clips without disk I/O ---
 
     [Fact]
-    public void FilteredClips_OrderNewestFirst()
+    public async Task FilteredClips_OrderNewestFirst()
     {
         var clips = TestClips.Create(3); // timestamps increase with index
         var vm = new MainWindowViewModel(() => null!, clipLoader: _ => clips);
 
-        vm.LoadClips(new[] { "root" });
+        await vm.LoadClipsAsync(new[] { "root" });
 
         vm.FilteredClips.Select(c => c.Name).ShouldBe(new[] { "Clip 2", "Clip 1", "Clip 0" });
     }
 
     [Fact]
-    public void FilteredClips_FiltersByNameCaseInsensitively()
+    public async Task FilteredClips_FiltersByNameCaseInsensitively()
     {
         var clips = TestClips.Create(3);
         var vm = new MainWindowViewModel(() => null!, clipLoader: _ => clips);
-        vm.LoadClips(new[] { "root" });
+        await vm.LoadClipsAsync(new[] { "root" });
 
         vm.FilterText = "clip 1";
 
@@ -302,12 +302,12 @@ public void FilteredClips_FiltersByNameCaseInsensitively()
     }
 
     [Fact]
-    public void FilteredClips_FiltersByPath()
+    public async Task FilteredClips_FiltersByPath()
     {
         // TestClips share a folder path but have distinct names, so a path-only match keeps them all.
         var clips = TestClips.Create(2);
         var vm = new MainWindowViewModel(() => null!, clipLoader: _ => clips);
-        vm.LoadClips(new[] { "root" });
+        await vm.LoadClipsAsync(new[] { "root" });
 
         vm.FilterText = clips[0].FullPath;
 
@@ -315,11 +315,11 @@ public void FilteredClips_FiltersByPath()
     }
 
     [Fact]
-    public void FilteredClips_NoMatch_IsEmpty()
+    public async Task FilteredClips_NoMatch_IsEmpty()
     {
         var clips = TestClips.Create(3);
         var vm = new MainWindowViewModel(() => null!, clipLoader: _ => clips);
-        vm.LoadClips(new[] { "root" });
+        await vm.LoadClipsAsync(new[] { "root" });
 
         vm.FilterText = "no-such-clip";
 
@@ -410,8 +410,8 @@ public void ControllerError_ShowsErrorOverlay()
     [Fact]
     public void CanGoNextPrevious_ReflectControllerPlaylist()
     {
-        var vm = CreateViewModelWithController(out _, out _, clipLoader: _ => TestClips.Create(3));
-        vm.LoadClips(new[] { "root" });
+        var vm = CreateViewModelWithController(out var controller, out _);
+        controller.LoadClips(TestClips.Create(3)); // set the playlist directly (synchronous, on the test thread)
 
         // Playlist loaded, nothing playing yet: can advance, can't go back.
         vm.CanGoNext.ShouldBeTrue();
diff --git a/SentryReplay/MainWindow.xaml b/SentryReplay/MainWindow.xaml
index 977c49a..bb1dad9 100644
--- a/SentryReplay/MainWindow.xaml
+++ b/SentryReplay/MainWindow.xaml
@@ -30,9 +30,14 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border Padding="{TemplateBinding Padding}"
+                        <Border x:Name="ButtonBorder"
+                                Padding="{TemplateBinding Padding}"
                                 Background="{TemplateBinding Background}"
-                                CornerRadius="4">
+                                CornerRadius="4"
+                                RenderTransformOrigin="0.5,0.5">
+                            <Border.RenderTransform>
+                                <ScaleTransform />
+                            </Border.RenderTransform>
                             <ContentPresenter HorizontalAlignment="Center"
                                               VerticalAlignment="Center" />
                         </Border>
@@ -42,6 +47,34 @@
                             </Trigger>
                             <Trigger Property="IsPressed" Value="True">
                                 <Setter Property="Background" Value="{DynamicResource ControlFillColorTertiaryBrush}" />
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="ButtonBorder"
+                                                             Storyboard.TargetProperty="RenderTransform.ScaleX"
+                                                             To="0.96"
+                                                             Duration="0:0:0.08" />
+                                            <DoubleAnimation Storyboard.TargetName="ButtonBorder"
+                                                             Storyboard.TargetProperty="RenderTransform.ScaleY"
+                                                             To="0.96"
+                                                             Duration="0:0:0.08" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation Storyboard.TargetName="ButtonBorder"
+                                                             Storyboard.TargetProperty="RenderTransform.ScaleX"
+                                                             To="1"
+                                                             Duration="0:0:0.12" />
+                                            <DoubleAnimation Storyboard.TargetName="ButtonBorder"
+                                                             Storyboard.TargetProperty="RenderTransform.ScaleY"
+                                                             To="1"
+                                                             Duration="0:0:0.12" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter Property="Background" Value="{DynamicResource ControlFillColorDisabledBrush}" />
@@ -84,6 +117,8 @@
                             <ContentPresenter />
                         </Border>
                         <ControlTemplate.Triggers>
+                            <!--  No scale animation here: these tiles host the live mini-camera previews, and the
+                                  Flyleaf surface follows the tile's render transform, so scaling would shift the video.  -->
                             <Trigger Property="IsMouseOver" Value="True">
                                 <Setter TargetName="TileBorder" Property="Background" Value="{DynamicResource ControlFillColorSecondaryBrush}" />
                             </Trigger>
@@ -147,6 +182,24 @@
         </Style>
     </Window.Resources>
 
+    <Window.Triggers>
+        <!--  Fade the window in on launch  -->
+        <EventTrigger RoutedEvent="Loaded">
+            <BeginStoryboard>
+                <Storyboard>
+                    <DoubleAnimation Storyboard.TargetProperty="Opacity"
+                                     From="0"
+                                     To="1"
+                                     Duration="0:0:0.25">
+                        <DoubleAnimation.EasingFunction>
+                            <CubicEase EasingMode="EaseOut" />
+                        </DoubleAnimation.EasingFunction>
+                    </DoubleAnimation>
+                </Storyboard>
+            </BeginStoryboard>
+        </EventTrigger>
+    </Window.Triggers>
+
     <Grid>
         <Grid Visibility="{Binding ShowMainContent, Converter={local:BoolToVisibilityConverter}}">
             <Grid.ColumnDefinitions>
@@ -295,13 +348,36 @@
                     </ListBox.ItemTemplate>
                 </ListBox>
 
+                <!--  Subtle animated loading bar shown while the clip list is (re)scanned  -->
+                <ProgressBar Grid.Row="1"
+                             Height="3"
+                             Margin="4,0"
+                             VerticalAlignment="Top"
+                             Background="Transparent"
+                             BorderThickness="0"
+                             IsIndeterminate="True"
+                             Visibility="{Binding IsLoadingClips, Converter={local:BoolToVisibilityConverter}}" />
+
                 <!--  Folder picker  -->
                 <StackPanel Grid.Row="2"
                             Margin="8">
-                    <Button Content="📁 Select Folder"
-                            Command="{Binding OpenFolderCommand}"
-                            Padding="12"
-                            Style="{StaticResource PlayerButton}" />
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Button Grid.Column="0"
+                                Content="📁 Select Folder"
+                                Command="{Binding OpenFolderCommand}"
+                                Padding="12"
+                                Style="{StaticResource PlayerButton}" />
+                        <Button Grid.Column="1"
+                                Content="🔄"
+                                Command="{Binding RefreshClipsCommand}"
+                                Padding="12"
+                                Style="{StaticResource PlayerButton}"
+                                ToolTip="Rescan the current folder for clips" />
+                    </Grid>
                     <Grid Margin="0,8,0,0">
                         <Button Content="ℹ️ About / Help"
                                 Command="{Binding ToggleAboutCommand}"
@@ -532,12 +608,11 @@
                                                 CornerRadius="4">
                                             <Grid>
                                                 <ContentControl x:Name="FrontTileHostSlot" />
-                                                <TextBlock Text="Main view"
-                                                           HorizontalAlignment="Center"
-                                                           VerticalAlignment="Center"
-                                                           FontSize="12"
-                                                           Foreground="{DynamicResource TextControlPlaceholderForeground}"
-                                                           Visibility="{Binding IsFrontViewSelected, Converter={local:BoolToVisibilityConverter}}" />
+                                                <!--  Single-screen icon: this camera is the main view (cf. the 2x2 grid icon)  -->
+                                                <Border Margin="18"
+                                                        Background="{DynamicResource ControlFillColorSecondaryBrush}"
+                                                        CornerRadius="3"
+                                                        Visibility="{Binding IsFrontViewSelected, Converter={local:BoolToVisibilityConverter}}" />
                                             </Grid>
                                         </Border>
                                         <TextBlock Grid.Row="1"
@@ -565,12 +640,11 @@
                                                 CornerRadius="4">
                                             <Grid>
                                                 <ContentControl x:Name="RearTileHostSlot" />
-                                                <TextBlock Text="Main view"
-                                                           HorizontalAlignment="Center"
-                                                           VerticalAlignment="Center"
-                                                           FontSize="12"
-                                                           Foreground="{DynamicResource TextControlPlaceholderForeground}"
-                                                           Visibility="{Binding IsRearViewSelected, Converter={local:BoolToVisibilityConverter}}" />
+                                                <!--  Single-screen icon: this camera is the main view (cf. the 2x2 grid icon)  -->
+                                                <Border Margin="18"
+                                                        Background="{DynamicResource ControlFillColorSecondaryBrush}"
+                                                        CornerRadius="3"
+                                                        Visibility="{Binding IsRearViewSelected, Converter={local:BoolToVisibilityConverter}}" />
                                             </Grid>
                                         </Border>
                                         <TextBlock Grid.Row="1"
@@ -598,12 +672,11 @@
                                                 CornerRadius="4">
                                             <Grid>
                                                 <ContentControl x:Name="LeftTileHostSlot" />
-                                                <TextBlock Text="Main view"
-                                                           HorizontalAlignment="Center"
-                                                           VerticalAlignment="Center"
-                                                           FontSize="12"
-                                                           Foreground="{DynamicResource TextControlPlaceholderForeground}"
-                                                           Visibility="{Binding IsLeftViewSelected, Converter={local:BoolToVisibilityConverter}}" />
+                                                <!--  Single-screen icon: this camera is the main view (cf. the 2x2 grid icon)  -->
+                                                <Border Margin="18"
+                                                        Background="{DynamicResource ControlFillColorSecondaryBrush}"
+                                                        CornerRadius="3"
+                                                        Visibility="{Binding IsLeftViewSelected, Converter={local:BoolToVisibilityConverter}}" />
                                             </Grid>
                                         </Border>
                                         <TextBlock Grid.Row="1"
@@ -631,12 +704,11 @@
                                                 CornerRadius="4">
                                             <Grid>
                                                 <ContentControl x:Name="RightTileHostSlot" />
-                                                <TextBlock Text="Main view"
-                                                           HorizontalAlignment="Center"
-                                                           VerticalAlignment="Center"
-                                                           FontSize="12"
-                                                           Foreground="{DynamicResource TextControlPlaceholderForeground}"
-                                                           Visibility="{Binding IsRightViewSelected, Converter={local:BoolToVisibilityConverter}}" />
+                                                <!--  Single-screen icon: this camera is the main view (cf. the 2x2 grid icon)  -->
+                                                <Border Margin="18"
+                                                        Background="{DynamicResource ControlFillColorSecondaryBrush}"
+                                                        CornerRadius="3"
+                                                        Visibility="{Binding IsRightViewSelected, Converter={local:BoolToVisibilityConverter}}" />
                                             </Grid>
                                         </Border>
                                         <TextBlock Grid.Row="1"
@@ -655,6 +727,29 @@
                     <Border Grid.RowSpan="2"
                             Background="#80000000"
                             Visibility="{Binding ShowStatusOverlay, Converter={local:BoolToVisibilityConverter}}">
+                        <Border.Style>
+                            <Style TargetType="Border">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding ShowStatusOverlay}"
+                                                 Value="True">
+                                        <DataTrigger.EnterActions>
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimation Storyboard.TargetProperty="Opacity"
+                                                                     From="0"
+                                                                     To="1"
+                                                                     Duration="0:0:0.2">
+                                                        <DoubleAnimation.EasingFunction>
+                                                            <CubicEase EasingMode="EaseOut" />
+                                                        </DoubleAnimation.EasingFunction>
+                                                    </DoubleAnimation>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </DataTrigger.EnterActions>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Border.Style>
                         <StackPanel MaxWidth="500"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center">
diff --git a/SentryReplay/MainWindow.xaml.cs b/SentryReplay/MainWindow.xaml.cs
index e4f67de..524444e 100644
--- a/SentryReplay/MainWindow.xaml.cs
+++ b/SentryReplay/MainWindow.xaml.cs
@@ -118,70 +118,55 @@ private void UpdateCameraHostLayout()
         if (PrimaryCameraHostSlot is null)
             return;
 
-        ClearCameraHostSlots();
-
-        switch (_viewModel.SelectedCameraView)
+        foreach (var (host, slot) in GetCameraHostLayout(_viewModel.SelectedCameraView))
         {
-            case MainWindowViewModel.GridCameraView:
-                MoveHostToSlot(FrontFlyleafHost, GridFrontHostSlot);
-                MoveHostToSlot(BackFlyleafHost, GridRearHostSlot);
-                MoveHostToSlot(LeftFlyleafHost, GridLeftHostSlot);
-                MoveHostToSlot(RightFlyleafHost, GridRightHostSlot);
-                break;
-
-            case MainWindowViewModel.RearCameraView:
-                MoveHostToSlot(BackFlyleafHost, PrimaryCameraHostSlot);
-                MoveHostToSlot(FrontFlyleafHost, FrontTileHostSlot);
-                MoveHostToSlot(LeftFlyleafHost, LeftTileHostSlot);
-                MoveHostToSlot(RightFlyleafHost, RightTileHostSlot);
-                break;
-
-            case MainWindowViewModel.LeftCameraView:
-                MoveHostToSlot(LeftFlyleafHost, PrimaryCameraHostSlot);
-                MoveHostToSlot(FrontFlyleafHost, FrontTileHostSlot);
-                MoveHostToSlot(BackFlyleafHost, RearTileHostSlot);
-                MoveHostToSlot(RightFlyleafHost, RightTileHostSlot);
-                break;
-
-            case MainWindowViewModel.RightCameraView:
-                MoveHostToSlot(RightFlyleafHost, PrimaryCameraHostSlot);
-                MoveHostToSlot(FrontFlyleafHost, FrontTileHostSlot);
-                MoveHostToSlot(BackFlyleafHost, RearTileHostSlot);
-                MoveHostToSlot(LeftFlyleafHost, LeftTileHostSlot);
-                break;
-
-            default:
-                MoveHostToSlot(FrontFlyleafHost, PrimaryCameraHostSlot);
-                MoveHostToSlot(BackFlyleafHost, RearTileHostSlot);
-                MoveHostToSlot(LeftFlyleafHost, LeftTileHostSlot);
-                MoveHostToSlot(RightFlyleafHost, RightTileHostSlot);
-                break;
+            MoveHostToSlot(host, slot);
         }
+
+        // Force a synchronous layout pass so each moved host reaches its final bounds promptly. Note: a
+        // brief flash of the reparented Flyleaf surface at its old size is a known limitation here and is
+        // accepted (eliminating it would require not reparenting the hosts at all).
+        UpdateLayout();
     }
 
-    private void ClearCameraHostSlots()
+    private IReadOnlyList<(FlyleafHost Host, ContentControl Slot)> GetCameraHostLayout(string view) => view switch
     {
-        ContentControl[] slots =
+        MainWindowViewModel.GridCameraView =>
         [
-            PrimaryCameraHostSlot,
-            GridFrontHostSlot,
-            GridRearHostSlot,
-            GridLeftHostSlot,
-            GridRightHostSlot,
-            FrontTileHostSlot,
-            RearTileHostSlot,
-            LeftTileHostSlot,
-            RightTileHostSlot,
-        ];
-
-        foreach (var slot in slots)
-        {
-            if (slot.Content is FlyleafHost)
-            {
-                slot.Content = null;
-            }
-        }
-    }
+            (FrontFlyleafHost, GridFrontHostSlot),
+            (BackFlyleafHost, GridRearHostSlot),
+            (LeftFlyleafHost, GridLeftHostSlot),
+            (RightFlyleafHost, GridRightHostSlot),
+        ],
+        MainWindowViewModel.RearCameraView =>
+        [
+            (BackFlyleafHost, PrimaryCameraHostSlot),
+            (FrontFlyleafHost, FrontTileHostSlot),
+            (LeftFlyleafHost, LeftTileHostSlot),
+            (RightFlyleafHost, RightTileHostSlot),
+        ],
+        MainWindowViewModel.LeftCameraView =>
+        [
+            (LeftFlyleafHost, PrimaryCameraHostSlot),
+            (FrontFlyleafHost, FrontTileHostSlot),
+            (BackFlyleafHost, RearTileHostSlot),
+            (RightFlyleafHost, RightTileHostSlot),
+        ],
+        MainWindowViewModel.RightCameraView =>
+        [
+            (RightFlyleafHost, PrimaryCameraHostSlot),
+            (FrontFlyleafHost, FrontTileHostSlot),
+            (BackFlyleafHost, RearTileHostSlot),
+            (LeftFlyleafHost, LeftTileHostSlot),
+        ],
+        _ =>
+        [
+            (FrontFlyleafHost, PrimaryCameraHostSlot),
+            (BackFlyleafHost, RearTileHostSlot),
+            (LeftFlyleafHost, LeftTileHostSlot),
+            (RightFlyleafHost, RightTileHostSlot),
+        ],
+    };
 
     private static void MoveHostToSlot(FlyleafHost host, ContentControl slot)
     {
diff --git a/SentryReplay/MainWindowViewModel.cs b/SentryReplay/MainWindowViewModel.cs
index 8315842..2b8c1d1 100644
--- a/SentryReplay/MainWindowViewModel.cs
+++ b/SentryReplay/MainWindowViewModel.cs
@@ -38,6 +38,10 @@ public partial class MainWindowViewModel : ObservableObject
     private bool _isSeeking;
     private bool _isInitialized;
 
+    // The source of dashcam roots: auto-discovery by default, or the user's last picked folders. Refresh
+    // re-evaluates it to rescan for newly added clips (and, for auto-discovery, newly connected drives).
+    private Func<IEnumerable<string>> _rootSource = CamStorage.FindCommonRoots;
+
     /// <param name="playerControllerFactory">Creates the playback controller (the view supplies one bound to its Flyleaf hosts).</param>
     /// <param name="clipLoader">Maps a dashcam root to its clips. Defaults to scanning the filesystem; overridable for tests.</param>
     /// <param name="backgroundYield">Yields to the UI before a clip loads so the window stays responsive. Overridable for tests.</param>
@@ -130,9 +134,12 @@ public string PositionText
 
     public string PlayPauseIcon => IsPlaying ? "⏸" : "▶";
 
-    public bool ShowStatusOverlay => IsLoading || ShowErrorOverlay || HasNoClipSelected;
+    // The full-screen overlay only covers the no-video states (scanning with no clip, error, empty); as a WPF
+    // sibling it can't draw over the Flyleaf video surface anyway. While a selected clip loads, the hosts stay
+    // visible and simply show black until the first frame decodes — no loading screen flashing mid-playback.
+    public bool ShowStatusOverlay => (IsLoading && SelectedClip is null) || ShowErrorOverlay || HasNoClipSelected;
 
-    public bool ShowVideoHosts => !ShowStatusOverlay;
+    public bool ShowVideoHosts => SelectedClip is not null && !ShowErrorOverlay;
 
     public bool HasError => ShowErrorOverlay;
 
@@ -217,6 +224,11 @@ public string PositionText
     [NotifyPropertyChangedFor(nameof(IsIndeterminateProgress))]
     private bool _isRendering;
 
+    // True while the clip list is being (re)scanned from disk; drives the sidebar loading indicator.
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(RefreshClipsCommand))]
+    private bool _isLoadingClips;
+
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(RenderProgressPercent))]
     [NotifyPropertyChangedFor(nameof(LoadingStatusText))]
@@ -274,7 +286,7 @@ public async Task InitializeAsync()
         if (_flyleafRuntime.TryStart())
         {
             InitializePlayer();
-            LoadClips(CamStorage.FindCommonRoots());
+            await LoadClipsAsync(_rootSource());
         }
         else
         {
@@ -304,27 +316,74 @@ public void InitializePlayer()
         _playerController.PlaybackSpeed = SelectedPlaybackSpeed;
     }
 
-    public void LoadClips(IEnumerable<string> roots)
+    public async Task LoadClipsAsync(IEnumerable<string> roots, TimeSpan minimumLoadingDuration = default)
     {
         ClearError();
         _allClips.Clear();
         SelectedClip = null;
+        IsLoading = true;
+        IsLoadingClips = true;
+
+        // Clear the list right away so a (re)scan visibly empties it and shows the loading bar before refilling.
+        OnPropertyChanged(nameof(FilteredClips));
+        RefreshClipState();
+
+        var stopwatch = Stopwatch.StartNew();
+
+        try
+        {
+            // Scan the disk off the UI thread; the continuation resumes on it via the WPF
+            // SynchronizationContext, so all view-model state below is mutated on the UI thread.
+            var result = await Task.Run(() => ScanRoots(roots));
+
+            if (!result.HadRoots)
+            {
+                ShowError(
+                    "No Dashcam Folders Found",
+                    "Click 'Select Folder' to choose a folder containing Tesla dashcam footage (TeslaCam folder).",
+                    canDismiss: true);
+            }
+            else
+            {
+                _allClips.AddRange(result.Clips);
+                foreach (var error in result.Errors)
+                {
+                    ShowError(error.Title, error.Details);
+                }
+            }
+
+            _playerController?.LoadClips(_allClips);
+
+            // Hold the loading state briefly so a fast rescan still reads as a deliberate refresh
+            // (clear -> loading -> refill) instead of an imperceptible flicker.
+            var remaining = minimumLoadingDuration - stopwatch.Elapsed;
+            if (remaining > TimeSpan.Zero)
+            {
+                await Task.Delay(remaining);
+            }
+        }
+        finally
+        {
+            IsLoading = false;
+            IsLoadingClips = false;
+            OnPropertyChanged(nameof(FilteredClips));
+            RefreshClipState();
+        }
+    }
 
+    private ScanResult ScanRoots(IEnumerable<string> roots)
+    {
         var rootList = roots?.Where(root => !string.IsNullOrWhiteSpace(root)).ToList() ?? [];
         if (rootList.Count == 0)
         {
             Log.Information("No dashcam roots found");
-            ShowError(
-                "No Dashcam Folders Found",
-                "Click 'Select Folder' to choose a folder containing Tesla dashcam footage (TeslaCam folder).",
-                canDismiss: true);
-            RefreshClipState();
-            return;
+            return new ScanResult([], [], HadRoots: false);
         }
 
         Log.Information("Loading dashcam clips. RootCount={RootCount}; Roots={Roots}", rootList.Count, rootList);
         var totalStopwatch = Stopwatch.StartNew();
-        var failedRoots = 0;
+        var clips = new List<CamClip>();
+        var errors = new List<ClipLoadError>();
 
         foreach (var root in rootList)
         {
@@ -333,41 +392,44 @@ public void LoadClips(IEnumerable<string> roots)
 
             try
             {
-                var clips = _clipLoader(root);
-                _allClips.AddRange(clips);
+                var rootClips = _clipLoader(root);
+                clips.AddRange(rootClips);
                 Log.Information(
                     "Scanned dashcam root. Root={Root}; ClipCount={ClipCount}; ElapsedMs={ElapsedMs}",
                     root,
-                    clips.Count,
+                    rootClips.Count,
                     rootStopwatch.ElapsedMilliseconds);
             }
             catch (UnauthorizedAccessException ex)
             {
-                failedRoots++;
                 Log.Error(ex, "Access denied while loading dashcam root. Root={Root}", root);
-                ShowError("Access Denied", $"Cannot access folder: {root}\n\nCheck that you have permission to read this location.");
+                errors.Add(new ClipLoadError("Access Denied", $"Cannot access folder: {root}\n\nCheck that you have permission to read this location."));
             }
             catch (Exception ex)
             {
-                failedRoots++;
                 Log.Error(ex, "Failed to load dashcam root. Root={Root}", root);
-                ShowError("Error Loading Clips", $"Failed to load clips from:\n{root}\n\nError: {ex.Message}");
+                errors.Add(new ClipLoadError("Error Loading Clips", $"Failed to load clips from:\n{root}\n\nError: {ex.Message}"));
             }
         }
 
-        _playerController?.LoadClips(_allClips);
-        RefreshClipState();
         Log.Information(
             "Finished loading dashcam clips. ClipCount={ClipCount}; RootCount={RootCount}; FailedRootCount={FailedRootCount}; ElapsedMs={ElapsedMs}",
-            _allClips.Count,
+            clips.Count,
             rootList.Count,
-            failedRoots,
+            errors.Count,
             totalStopwatch.ElapsedMilliseconds);
+        return new ScanResult(clips, errors, HadRoots: true);
     }
 
+    private sealed record ScanResult(IReadOnlyList<CamClip> Clips, IReadOnlyList<ClipLoadError> Errors, bool HadRoots);
+
+    private sealed record ClipLoadError(string Title, string Details);
+
     private void RefreshClipState()
     {
-        OnPropertyChanged(nameof(FilteredClips));
+        // FilteredClips is intentionally NOT raised here: this runs on every clip change, and
+        // re-notifying the unchanged list rebuilds the ListBox and retriggers its fade (flicker).
+        // The list is notified explicitly only when it actually changes (load + FilterText).
         OnPropertyChanged(nameof(HasNoClipSelected));
         OnPropertyChanged(nameof(ShowStatusOverlay));
         OnPropertyChanged(nameof(ShowVideoHosts));
@@ -389,17 +451,19 @@ private async Task OpenFolderAsync()
 
         if (dialog.ShowDialog() == true)
         {
+            var folders = dialog.FolderNames;
             Log.Information(
                 "User selected dashcam folders. FolderCount={FolderCount}; Folders={Folders}",
-                dialog.FolderNames.Length,
-                dialog.FolderNames);
+                folders.Length,
+                folders);
 
             if (_playerController is not null)
             {
                 await _playerController.StopAsync();
             }
 
-            LoadClips(dialog.FolderNames);
+            _rootSource = () => folders;
+            await LoadClipsAsync(folders);
         }
         else
         {
@@ -407,6 +471,21 @@ private async Task OpenFolderAsync()
         }
     }
 
+    [RelayCommand(CanExecute = nameof(CanRefreshClips))]
+    private async Task RefreshClipsAsync()
+    {
+        Log.Debug("Refreshing clips");
+
+        if (_playerController is not null)
+        {
+            await _playerController.StopAsync();
+        }
+
+        await LoadClipsAsync(_rootSource(), TimeSpan.FromMilliseconds(400));
+    }
+
+    private bool CanRefreshClips => !IsLoadingClips;
+
     [RelayCommand]
     private async Task PlayPauseAsync()
     {
@@ -459,7 +538,7 @@ private async Task DownloadFFmpegAsync()
             if (_flyleafRuntime.TryStart())
             {
                 InitializePlayer();
-                LoadClips(CamStorage.FindCommonRoots());
+                await LoadClipsAsync(_rootSource());
             }
             else
             {