diff --git a/native/Avalonia.Native/src/OSX/automation.mm b/native/Avalonia.Native/src/OSX/automation.mm
index 4b325a092d..9fe0ff3c60 100644
--- a/native/Avalonia.Native/src/OSX/automation.mm
+++ b/native/Avalonia.Native/src/OSX/automation.mm
@@ -291,8 +291,8 @@ private:
 
 - (id)accessibilityWindow
 {
-    id topLevel = [self accessibilityTopLevelUIElement];
-    return [topLevel isKindOfClass:[NSWindow class]] ? topLevel : nil;
+    auto rootPeer = _peer->GetVisualRoot();
+    return [AvnAccessibilityElement acquire:rootPeer];
 }
 
 - (BOOL)isAccessibilityExpanded