diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
index 0140281d50..785fd49983 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/EventTreeNode.cs
@@ -115,7 +115,7 @@ namespace Avalonia.Diagnostics.ViewModels
                     var link = _currentEvent.EventChain[linkIndex];
 
                     link.Handled = true;
-                    _currentEvent.HandledBy = link;
+                    _currentEvent.HandledBy ??= link;
                 }
             }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
index cd2e92914a..f62d8a0b79 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
@@ -29,6 +29,7 @@
 
     <Style Selector="ListBoxItem.handled" >
       <Setter Property="Background" Value="#d9ffdc" />
+      <Setter Property="Foreground" Value="Black" />
     </Style>
   </UserControl.Styles>