From 912281ffc695b1145b087ce68b6194c57b20d3a3 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <Gillibald@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:03:40 +0100
Subject: [PATCH] Make ContentPresenter.RecognizesAccessKey stylable (#19893)

* Make HyperlinkButton's ContentPresenter.RecognizesAccessKey stylable

* Adjust all controls that are using RecognizesAccessKey
---
 .../Themes/Fluent/ColorView.xaml                      |  5 ++++-
 .../Themes/Simple/ColorView.xaml                      |  5 ++++-
 src/Avalonia.Themes.Fluent/Controls/Button.xaml       |  5 ++++-
 src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml     |  5 ++++-
 .../Controls/DropDownButton.xaml                      |  5 ++++-
 .../Controls/HeaderedContentControl.xaml              | 11 +++++++++--
 .../Controls/HyperlinkButton.xaml                     |  7 +++++--
 src/Avalonia.Themes.Fluent/Controls/Label.xaml        |  5 ++++-
 src/Avalonia.Themes.Fluent/Controls/Menu.xaml         |  5 ++++-
 src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml     |  5 ++++-
 src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml  |  7 +++++--
 src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml  |  5 ++++-
 src/Avalonia.Themes.Fluent/Controls/TabItem.xaml      |  5 ++++-
 src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml |  5 ++++-
 src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml |  7 +++++--
 src/Avalonia.Themes.Simple/Controls/Button.xaml       |  6 +++++-
 src/Avalonia.Themes.Simple/Controls/CheckBox.xaml     |  6 +++++-
 .../Controls/DropDownButton.xaml                      |  7 +++++--
 .../Controls/HeaderedContentControl.xaml              | 10 ++++++++--
 .../Controls/HyperlinkButton.xaml                     |  5 ++++-
 src/Avalonia.Themes.Simple/Controls/Label.xaml        |  7 +++++--
 src/Avalonia.Themes.Simple/Controls/RadioButton.xaml  |  7 +++++--
 src/Avalonia.Themes.Simple/Controls/SplitButton.xaml  |  5 ++++-
 src/Avalonia.Themes.Simple/Controls/TabItem.xaml      |  6 +++++-
 src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml |  6 +++++-
 src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml |  5 ++++-
 26 files changed, 123 insertions(+), 34 deletions(-)

diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index e4a8ecace4..ad517e8e80 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -185,12 +185,15 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
index 942d4e5a03..095c82a176 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
@@ -183,12 +183,15 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:checked /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/Button.xaml b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
index 6c6ca967e7..7aea463352 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Button.xaml
@@ -36,12 +36,15 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ButtonBorderBrushPointerOver}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
index 1db956f141..d12dfd6149 100644
--- a/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml
@@ -62,7 +62,6 @@
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           Margin="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                           TextWrapping="Wrap"
@@ -71,6 +70,10 @@
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <!-- Unchecked PointerOver State -->
     <Style Selector="^:pointerover">
       <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
diff --git a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
index 2b26a7ef89..ca8cb9941b 100644
--- a/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/DropDownButton.xaml
@@ -44,7 +44,6 @@
                                   Content="{TemplateBinding Content}" 
                                   ContentTemplate="{TemplateBinding ContentTemplate}"
                                   Padding="{TemplateBinding Padding}" 
-                                  RecognizesAccessKey="True" 
                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                   VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
                 
@@ -65,6 +64,10 @@
         </Setter.Value>
       </Setter>
       
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
       <!--  PointerOver State  -->
       <Style Selector="^:pointerover /template/ Border#RootBorder">
         <Setter Property="Background" Value="{DynamicResource ButtonBackgroundPointerOver}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/HeaderedContentControl.xaml b/src/Avalonia.Themes.Fluent/Controls/HeaderedContentControl.xaml
index d2ccf2b0c1..4474ac07ab 100644
--- a/src/Avalonia.Themes.Fluent/Controls/HeaderedContentControl.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/HeaderedContentControl.xaml
@@ -15,7 +15,6 @@
           <Grid RowDefinitions="auto *">
             <ContentPresenter Name="PART_HeaderPresenter"
                               Content="{TemplateBinding Header}"
-                              RecognizesAccessKey="True"
                               ContentTemplate="{TemplateBinding HeaderTemplate}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -23,7 +22,6 @@
             <ContentPresenter Name="PART_ContentPresenter"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               Content="{TemplateBinding Content}"
-                              RecognizesAccessKey="True"
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                               Grid.Row="1" />
@@ -31,5 +29,14 @@
         </Border>
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style> 
+
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/HyperlinkButton.xaml b/src/Avalonia.Themes.Fluent/Controls/HyperlinkButton.xaml
index a4fc791744..8b390a988a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/HyperlinkButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/HyperlinkButton.xaml
@@ -5,7 +5,7 @@
   <Design.PreviewWith>
     <Border Padding="20">
       <StackPanel Spacing="20">
-        <HyperlinkButton Content="Click Me!" />
+        <HyperlinkButton Content="_Click Me!" />
       </StackPanel>
     </Border>
   </Design.PreviewWith>
@@ -42,12 +42,15 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource HyperlinkButtonBackgroundPointerOver}" />
       <Setter Property="BorderBrush" Value="{DynamicResource HyperlinkButtonBorderBrushPointerOver}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/Label.xaml b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
index 237da0bfa3..3271349f22 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Label.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Label.xaml
@@ -14,10 +14,13 @@
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
index 2d326c36f4..a0b0ce762f 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Menu.xaml
@@ -31,7 +31,6 @@
                               ContentTemplate="{TemplateBinding HeaderTemplate}"
                               VerticalAlignment="Center"
                               HorizontalAlignment="Stretch"
-                              RecognizesAccessKey="True"
                               Margin="{TemplateBinding Padding}"/>
             <Popup Name="PART_Popup"
                    WindowManagerAddShadowHint="False"
@@ -61,6 +60,10 @@
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style> 
+
     <Style Selector="^:selected">
       <Style Selector="^ /template/ Border#PART_LayoutRoot">
         <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemBackgroundPointerOver}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
index 78aba371b3..99dddf24a9 100644
--- a/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
@@ -100,7 +100,6 @@
                                 ContentTemplate="{TemplateBinding HeaderTemplate}"
                                 VerticalAlignment="Center"
                                 HorizontalAlignment="Stretch"
-                                RecognizesAccessKey="True"
                                 Grid.Column="2"/>
               <TextBlock x:Name="PART_InputGestureText"
                          Grid.Column="3"
@@ -146,6 +145,10 @@
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style> 
+
     <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
       <Setter Property="IsVisible" Value="True" />
     </Style>
diff --git a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
index 75be504e59..07ab1d3950 100644
--- a/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/RadioButton.xaml
@@ -71,13 +71,16 @@
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                 Content="{TemplateBinding Content}"
                 ContentTemplate="{TemplateBinding ContentTemplate}"
-                Foreground="{TemplateBinding Foreground}"
-                RecognizesAccessKey="True" />
+                Foreground="{TemplateBinding Foreground}" />
           </Grid>
         </Border>
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <!--  PointerOver State  -->
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Foreground" Value="{DynamicResource RadioButtonForegroundPointerOver}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
index 0550de16a3..c62ad599d4 100644
--- a/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/SplitButton.xaml
@@ -51,12 +51,15 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:pointerover /template/ ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource SplitButtonBackgroundPointerOver}" />
       <Setter Property="BorderBrush" Value="{DynamicResource SplitButtonBorderBrushPointerOver}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
index 085fc3165f..7f7d71caed 100644
--- a/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/TabItem.xaml
@@ -41,7 +41,6 @@
                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                 Content="{TemplateBinding Header}"
                 ContentTemplate="{TemplateBinding HeaderTemplate}"
-                RecognizesAccessKey="True"
                 />
             <Border Name="PART_SelectedPipe"
                     Background="{DynamicResource TabItemHeaderSelectedPipeFill}"
@@ -52,6 +51,10 @@
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <!--  Selected state  -->
     <!--  We don't use selector to PART_LayoutRoot, so developer can override selected item background with TabStripItem.Background  -->
     <Style Selector="^:selected">
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index ddf3070cbc..2d536e098a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -37,12 +37,15 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ToggleButtonBackgroundPointerOver}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ToggleButtonBorderBrushPointerOver}" />
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index 9a01290de4..5a262d3d56 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -45,8 +45,7 @@
               VerticalAlignment="Top"
               Content="{TemplateBinding Content}"
               ContentTemplate="{TemplateBinding ContentTemplate}"
-              Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
-              RecognizesAccessKey="True" />
+              Margin="{DynamicResource ToggleSwitchTopHeaderMargin}" />
 
           <Grid
               Grid.Row="1"
@@ -137,6 +136,10 @@
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:empty">
       <Setter Property="Margin" Value="0" />
     </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/Button.xaml b/src/Avalonia.Themes.Simple/Controls/Button.xaml
index 5599e49ae1..e99884221f 100644
--- a/src/Avalonia.Themes.Simple/Controls/Button.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/Button.xaml
@@ -22,10 +22,14 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           CornerRadius="{TemplateBinding CornerRadius}"
-                          RecognizesAccessKey="True"
                           TextElement.Foreground="{TemplateBinding Foreground}" />
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:pointerover /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/CheckBox.xaml b/src/Avalonia.Themes.Simple/Controls/CheckBox.xaml
index 68e969c140..47c03bcce5 100644
--- a/src/Avalonia.Themes.Simple/Controls/CheckBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/CheckBox.xaml
@@ -49,11 +49,15 @@
                             ContentTemplate="{TemplateBinding ContentTemplate}"
                             IsVisible="{TemplateBinding Content,
                                                         Converter={x:Static ObjectConverters.IsNotNull}}"
-                            RecognizesAccessKey="True"
                             TextElement.Foreground="{TemplateBinding Foreground}" />
         </Grid>
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style> 
+
     <Style Selector="^:pointerover /template/ Border#border">
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighBrush}" />
     </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml b/src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml
index 6d79d420f3..e58dd07812 100644
--- a/src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DropDownButton.xaml
@@ -31,8 +31,7 @@
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                                 Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                RecognizesAccessKey="True" />
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
 
               <PathIcon Name="DropDownGlyph"
                         Grid.Column="1"
@@ -50,6 +49,10 @@
       </Setter.Value>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^ /template/ PathIcon#DropDownGlyph">
       <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
       <Setter Property="Data" Value="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z" />
diff --git a/src/Avalonia.Themes.Simple/Controls/HeaderedContentControl.xaml b/src/Avalonia.Themes.Simple/Controls/HeaderedContentControl.xaml
index 5b306a831d..af4171f66c 100644
--- a/src/Avalonia.Themes.Simple/Controls/HeaderedContentControl.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/HeaderedContentControl.xaml
@@ -15,7 +15,6 @@
           <Grid RowDefinitions="auto *">
             <ContentPresenter Name="PART_HeaderPresenter"
                               Content="{TemplateBinding Header}"
-                              RecognizesAccessKey="True"
                               ContentTemplate="{TemplateBinding HeaderTemplate}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -27,7 +26,6 @@
             <ContentPresenter Name="PART_ContentPresenter"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               Content="{TemplateBinding Content}"
-                              RecognizesAccessKey="True"
                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                               FontSize="{TemplateBinding FontSize}"
@@ -39,5 +37,13 @@
         </Border>
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style> 
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/HyperlinkButton.xaml b/src/Avalonia.Themes.Simple/Controls/HyperlinkButton.xaml
index ef344d6696..7239d19474 100644
--- a/src/Avalonia.Themes.Simple/Controls/HyperlinkButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/HyperlinkButton.xaml
@@ -33,12 +33,15 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:disabled">
       <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/Label.xaml b/src/Avalonia.Themes.Simple/Controls/Label.xaml
index 2c9bb15742..23e0db8467 100644
--- a/src/Avalonia.Themes.Simple/Controls/Label.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/Label.xaml
@@ -15,9 +15,12 @@
                           BorderThickness="{TemplateBinding BorderThickness}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          RecognizesAccessKey="True" />
+                          CornerRadius="{TemplateBinding CornerRadius}" />
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
   </ControlTheme>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Simple/Controls/RadioButton.xaml b/src/Avalonia.Themes.Simple/Controls/RadioButton.xaml
index ea138d8806..0cfbe6ca57 100644
--- a/src/Avalonia.Themes.Simple/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/RadioButton.xaml
@@ -36,12 +36,15 @@
                             Margin="4,0,0,0"
                             VerticalAlignment="Center"
                             Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                            RecognizesAccessKey="True" />
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
         </Grid>
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:pointerover /template/ Ellipse#border">
       <Setter Property="Stroke" Value="{DynamicResource ThemeBorderHighBrush}" />
     </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
index 7562c9151e..ba99e8bfb2 100644
--- a/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/SplitButton.xaml
@@ -38,12 +38,15 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:pointerover /template/ ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ThemeControlMidColor}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidColor}" />
diff --git a/src/Avalonia.Themes.Simple/Controls/TabItem.xaml b/src/Avalonia.Themes.Simple/Controls/TabItem.xaml
index b8f8725f1f..ec42eb639d 100644
--- a/src/Avalonia.Themes.Simple/Controls/TabItem.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/TabItem.xaml
@@ -20,10 +20,14 @@
                           Content="{TemplateBinding Header}"
                           ContentTemplate="{TemplateBinding HeaderTemplate}"
                           CornerRadius="{TemplateBinding CornerRadius}"
-                          RecognizesAccessKey="True"
                           />
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:disabled /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Opacity" Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
diff --git a/src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml
index ad05f15f84..b908df5f4f 100644
--- a/src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ToggleButton.xaml
@@ -22,10 +22,14 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           CornerRadius="{TemplateBinding CornerRadius}"
-                          RecognizesAccessKey="True"
                           TextElement.Foreground="{TemplateBinding Foreground}" />
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^:checked /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
diff --git a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
index f2e0981d4c..ccbcc1b06f 100644
--- a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
@@ -64,7 +64,6 @@
                             Margin="{DynamicResource ToggleSwitchTopHeaderMargin}"
                             Content="{TemplateBinding Content}"
                             ContentTemplate="{TemplateBinding ContentTemplate}"
-                            RecognizesAccessKey="True"
                             VerticalAlignment="Top" />
 
           <Grid Grid.Row="1"
@@ -146,6 +145,10 @@
       </ControlTemplate>
     </Setter>
 
+    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="RecognizesAccessKey" Value="True" />
+    </Style>
+
     <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter:empty">
       <Setter Property="Margin" Value="0" />
     </Style>