diff --git a/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs
index db16bf0a53..64727c43c5 100644
--- a/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ItemsControlAutomationPeer.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Automation.Peers
                 if (!_searchedForScrollable)
                 {
                     if (Owner.GetValue(ListBox.ScrollProperty) is Control scrollable)
-                        _scroller = GetOrCreate(scrollable) as IScrollProvider;
+                        _scroller = GetOrCreate(scrollable).GetProvider<IScrollProvider>();
                     _searchedForScrollable = true;
                 }
 
diff --git a/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
index aea91b5e26..dab8c45567 100644
--- a/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ListItemAutomationPeer.cs
@@ -22,7 +22,7 @@ namespace Avalonia.Automation.Peers
                 if (Owner.Parent is Control parent)
                 {
                     var parentPeer = GetOrCreate(parent);
-                    return parentPeer as ISelectionProvider;
+                    return parentPeer.GetProvider<ISelectionProvider>();
                 }
 
                 return null;