diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index 10861538ae..5afcebe8f7 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -76,8 +76,8 @@ namespace Avalonia.Diagnostics.Views
             if (e.Modifiers == modifiers)
             {
                 var point = (Root as IInputRoot)?.MouseDevice?.GetPosition(Root) ?? default;
-                var control = Root.GetVisualsAt(point, x => (!(x is AdornerLayer) && x.IsVisible))
-                    .FirstOrDefault();
+
+                var control = Root.Renderer.HitTestFirst(point, Root, x => !(x is IInputElement ie && !ie.IsHitTestVisible));
 
                 if (control != null)
                 {