diff --git a/src/Avalonia.Controls/UserControl.cs b/src/Avalonia.Controls/UserControl.cs
index 3f51f613a4..e42ca5e0e6 100644
--- a/src/Avalonia.Controls/UserControl.cs
+++ b/src/Avalonia.Controls/UserControl.cs
@@ -27,9 +27,6 @@ namespace Avalonia.Controls
             remove { _nameScope.Unregistered -= value; }
         }
 
-        /// <inheritdoc/>
-        Type IStyleable.StyleKey => typeof(UserControl);
-
         /// <inheritdoc/>
         void INameScope.Register(string name, object element)
         {
diff --git a/src/Avalonia.Themes.Default/UserControl.xaml b/src/Avalonia.Themes.Default/UserControl.xaml
index 2bf5f19698..f4d0c21367 100644
--- a/src/Avalonia.Themes.Default/UserControl.xaml
+++ b/src/Avalonia.Themes.Default/UserControl.xaml
@@ -1,4 +1,4 @@
-<Style xmlns="https://github.com/avaloniaui" Selector="UserControl">
+<Style xmlns="https://github.com/avaloniaui" Selector=":is(UserControl)">
   <Setter Property="Template">
     <ControlTemplate>
       <ContentPresenter Name="PART_ContentPresenter"