diff --git a/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs b/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs
index 1d655bb691..74d804f2bf 100644
--- a/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs
@@ -52,8 +52,7 @@ namespace Avalonia.Controls.Primitives
         {
             if (InputPassThroughElement is object)
             {
-                var p = point.Transform(this.TransformToVisual(VisualRoot)!.Value);
-                var hit = VisualRoot.GetVisualAt(p, x => x != this);
+                var hit = VisualRoot.GetVisualAt(point, x => x != this);
 
                 if (hit is object)
                 {
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
index 36aa08c2f9..d8e5baac97 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -257,7 +257,7 @@ namespace Avalonia.Rendering.SceneGraph
                     if (childCount == 0 || wasVisited)
                     {
                         if ((wasVisited || FilterAndClip(node, ref clip)) &&
-                            (node.Visual is ICustomSimpleHitTest custom ? custom.HitTest(_point) : node.HitTest(_point)))
+                            (node.Visual is ICustomHitTest custom ? custom.HitTest(_point) : node.HitTest(_point)))
                         {
                             _current = node.Visual;