From afa914754c37e733d3d86957bdab0c19fe5c871a Mon Sep 17 00:00:00 2001
From: Owen McGirr <o.a.mcgirr@gmail.com>
Date: Tue, 28 Jul 2026 12:12:14 +0100
Subject: [PATCH] Improve switch profile accessibility

---
 .../SwitchControlProfileWindow.xaml           | 135 ++++++++++++++--
 .../SwitchControlProfileWindow.xaml.cs        |  93 +++++++++--
 src/SwitchifyPc.Tests/ButtonStyleTests.cs     |  75 ++++++++-
 .../SwitchControlProfileWindowTests.cs        | 148 ++++++++++++++++--
 4 files changed, 416 insertions(+), 35 deletions(-)

diff --git a/src/SwitchifyPc.App/SwitchControlProfileWindow.xaml b/src/SwitchifyPc.App/SwitchControlProfileWindow.xaml
index c206bed..50fb9e4 100644
--- a/src/SwitchifyPc.App/SwitchControlProfileWindow.xaml
+++ b/src/SwitchifyPc.App/SwitchControlProfileWindow.xaml
@@ -15,7 +15,8 @@
         Background="{DynamicResource ChromeBackground}"
         Foreground="{DynamicResource Text}"
         WindowStyle="None"
-        SizeChanged="Window_SizeChanged">
+        SizeChanged="Window_SizeChanged"
+        PreviewKeyDown="Window_PreviewKeyDown">
     <shell:WindowChrome.WindowChrome>
         <shell:WindowChrome CaptionHeight="44"
                             CornerRadius="0"
@@ -25,6 +26,8 @@
     </shell:WindowChrome.WindowChrome>
 
     <Window.Resources>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
         <Style TargetType="Button">
             <Setter Property="MinHeight" Value="38" />
             <Setter Property="Padding" Value="14,0" />
@@ -53,6 +56,12 @@
                                 <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource BrandPrimary}" />
                                 <Setter TargetName="Root" Property="Background" Value="{DynamicResource SurfaceMuted}" />
                             </Trigger>
+                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                <Setter TargetName="Root"
+                                        Property="BorderBrush"
+                                        Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                <Setter TargetName="Root" Property="BorderThickness" Value="2" />
+                            </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="Root" Property="Opacity" Value="0.55" />
                             </Trigger>
@@ -90,6 +99,12 @@
                                 <Setter TargetName="Root" Property="Background" Value="{DynamicResource BrandPrimaryHover}" />
                                 <Setter TargetName="Root" Property="BorderBrush" Value="{DynamicResource BrandPrimaryHover}" />
                             </Trigger>
+                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                <Setter TargetName="Root"
+                                        Property="BorderBrush"
+                                        Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                <Setter TargetName="Root" Property="BorderThickness" Value="2" />
+                            </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="Root" Property="Opacity" Value="0.55" />
                             </Trigger>
@@ -136,7 +151,12 @@
             <Setter Property="CaretBrush" Value="{DynamicResource Text}" />
             <Style.Triggers>
                 <Trigger Property="IsKeyboardFocusWithin" Value="True">
-                    <Setter Property="BorderBrush" Value="{DynamicResource BrandPrimary}" />
+                    <Setter Property="BorderBrush"
+                            Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                    <Setter Property="BorderThickness" Value="2" />
+                </Trigger>
+                <Trigger Property="IsReadOnly" Value="True">
+                    <Setter Property="Background" Value="{DynamicResource SurfaceMuted}" />
                 </Trigger>
                 <Trigger Property="IsEnabled" Value="False">
                     <Setter Property="Background" Value="{DynamicResource SurfaceMuted}" />
@@ -241,7 +261,10 @@
                             <Trigger Property="IsKeyboardFocusWithin" Value="True">
                                 <Setter TargetName="DropDownToggle"
                                         Property="BorderBrush"
-                                        Value="{DynamicResource BrandPrimary}" />
+                                        Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                <Setter TargetName="DropDownToggle"
+                                        Property="BorderThickness"
+                                        Value="2" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="DropDownToggle"
@@ -286,6 +309,13 @@
                                         Value="{DynamicResource SegmentSelectedBackground}" />
                                 <Setter Property="Foreground" Value="{DynamicResource BrandPrimary}" />
                             </Trigger>
+                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                <Setter TargetName="ItemBorder"
+                                        Property="Background"
+                                        Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                <Setter Property="Foreground"
+                                        Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                            </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
@@ -325,6 +355,12 @@
                                 <Setter Property="Foreground" Value="{DynamicResource BrandPrimary}" />
                                 <Setter Property="FontWeight" Value="Bold" />
                             </Trigger>
+                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                <Setter TargetName="Root"
+                                        Property="BorderBrush"
+                                        Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                                <Setter TargetName="Root" Property="BorderThickness" Value="2" />
+                            </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
@@ -398,8 +434,47 @@
                     <ListBox x:Name="ProfilesList"
                              Grid.Row="1"
                              SelectionChanged="ProfilesList_SelectionChanged"
-                             AutomationProperties.Name="Switch control profiles"
-                             DisplayMemberPath="Name" />
+                             AutomationProperties.Name="Switch control profiles">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <Grid AutomationProperties.Name="{Binding AccessibleName}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock VerticalAlignment="Center"
+                                               Text="{Binding Name}"
+                                               TextTrimming="CharacterEllipsis" />
+                                    <StackPanel Grid.Column="1"
+                                                Margin="8,0,0,0"
+                                                Orientation="Horizontal">
+                                        <Border Margin="0,0,4,0"
+                                                Padding="6,2"
+                                                Background="{DynamicResource SurfaceMuted}"
+                                                CornerRadius="8"
+                                                AutomationProperties.Name="Built-in profile"
+                                                Visibility="{Binding IsBuiltIn, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <TextBlock Text="Built-in"
+                                                       FontSize="10"
+                                                       FontWeight="SemiBold" />
+                                        </Border>
+                                        <Border Padding="6,2"
+                                                Background="{DynamicResource AccentContainer}"
+                                                BorderBrush="{DynamicResource BrandPrimary}"
+                                                BorderThickness="1"
+                                                CornerRadius="8"
+                                                AutomationProperties.Name="Active profile"
+                                                Visibility="{Binding IsActive, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <TextBlock Text="Active"
+                                                       FontSize="10"
+                                                       FontWeight="SemiBold"
+                                                       Foreground="{DynamicResource OnAccentContainer}" />
+                                        </Border>
+                                    </StackPanel>
+                                </Grid>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
                 </Grid>
             </Border>
 
@@ -454,7 +529,7 @@
                                                       DisplayMemberPath="Label"
                                                       SelectedValuePath="Value"
                                                       SelectedValue="{Binding SelectedType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                      IsEnabled="{Binding IsEditable}"
+                                                      Visibility="{Binding IsEditable, Converter={StaticResource BooleanToVisibilityConverter}}"
                                                       AutomationProperties.Name="{Binding TypeAutomationName}" />
                                             <ComboBox x:Name="BindingValueInput"
                                                       Grid.Column="2"
@@ -464,9 +539,24 @@
                                                       Text="{Binding ValueDisplay, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                                       IsEditable="True"
                                                       IsTextSearchEnabled="True"
-                                                      IsEnabled="{Binding IsEditable}"
+                                                      Visibility="{Binding IsEditable, Converter={StaticResource BooleanToVisibilityConverter}}"
                                                       AutomationProperties.Name="{Binding ValueAutomationName}"
                                                       AutomationProperties.HelpText="{Binding ValueHelp}" />
+                                            <TextBox Grid.Column="1"
+                                                     Margin="0,0,10,0"
+                                                     Text="{Binding SelectedTypeLabel, Mode=OneWay}"
+                                                     IsReadOnly="True"
+                                                     IsTabStop="True"
+                                                     Visibility="{Binding IsReadOnly, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                                     AutomationProperties.Name="{Binding TypeAutomationName}"
+                                                     AutomationProperties.HelpText="Read-only action type" />
+                                            <TextBox Grid.Column="2"
+                                                     Text="{Binding ReadOnlyValueDisplay, Mode=OneWay}"
+                                                     IsReadOnly="True"
+                                                     IsTabStop="True"
+                                                     Visibility="{Binding IsReadOnly, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                                     AutomationProperties.Name="{Binding ValueAutomationName}"
+                                                     AutomationProperties.HelpText="{Binding ValueHelp}" />
                                             <TextBlock Grid.Row="1"
                                                        Grid.Column="1"
                                                        Grid.ColumnSpan="2"
@@ -510,25 +600,40 @@
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
                 <StackPanel Orientation="Horizontal">
-                    <Button Content="New" MinWidth="84" Click="New_Click" />
-                    <Button Margin="8,0,0,0" Content="Duplicate" MinWidth="84" Click="Duplicate_Click" />
+                    <Button Content="_New"
+                            MinWidth="84"
+                            Click="New_Click"
+                            AutomationProperties.Name="New profile"
+                            AutomationProperties.HelpText="Alt+N" />
+                    <Button Margin="8,0,0,0"
+                            Content="D_uplicate"
+                            MinWidth="84"
+                            Click="Duplicate_Click"
+                            AutomationProperties.Name="Duplicate profile"
+                            AutomationProperties.HelpText="Alt+U" />
                     <Button x:Name="DeleteButton"
                             Margin="8,0,0,0"
-                            Content="Delete"
+                            Content="_Delete"
                             MinWidth="84"
-                            Click="Delete_Click" />
+                            Click="Delete_Click"
+                            AutomationProperties.Name="Delete profile"
+                            AutomationProperties.HelpText="Alt+D" />
                 </StackPanel>
                 <StackPanel Grid.Column="1" Orientation="Horizontal">
                     <Button x:Name="CancelButton"
-                            Content="Cancel changes"
+                            Content="_Cancel changes"
                             MinWidth="110"
-                            Click="Cancel_Click" />
+                            Click="Cancel_Click"
+                            AutomationProperties.Name="Cancel changes"
+                            AutomationProperties.HelpText="Alt+C" />
                     <Button x:Name="SaveButton"
                             Margin="8,0,0,0"
-                            Content="Save"
+                            Content="_Save"
                             MinWidth="84"
                             Style="{StaticResource PrimaryButton}"
-                            Click="Save_Click" />
+                            Click="Save_Click"
+                            AutomationProperties.Name="Save profile"
+                            AutomationProperties.HelpText="Ctrl+S or Alt+S" />
                 </StackPanel>
             </Grid>
         </Grid>
diff --git a/src/SwitchifyPc.App/SwitchControlProfileWindow.xaml.cs b/src/SwitchifyPc.App/SwitchControlProfileWindow.xaml.cs
index a3207fe..fd508cf 100644
--- a/src/SwitchifyPc.App/SwitchControlProfileWindow.xaml.cs
+++ b/src/SwitchifyPc.App/SwitchControlProfileWindow.xaml.cs
@@ -4,8 +4,10 @@
 using System.Windows;
 using System.Windows.Automation;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Media;
 using SwitchifyPc.Core.SwitchControl;
+using WpfKeyEventArgs = System.Windows.Input.KeyEventArgs;
 using WpfMessageBox = System.Windows.MessageBox;
 
 namespace SwitchifyPc.App;
@@ -16,6 +18,7 @@ public partial class SwitchControlProfileWindow : Window
     private readonly Func<string?> activeProfileId;
     private readonly Func<MessageBoxResult> confirmUnsavedChanges;
     private IReadOnlyList<SwitchControlProfile> profiles = [];
+    private IReadOnlyList<ProfileListItem> profileItems = [];
     private SwitchControlProfile? selected;
     private ProfileEditSnapshot? cleanSnapshot;
     private bool isEditable;
@@ -119,21 +122,31 @@ private void ApplyResponsiveLayout(double width)
     private void Reload(string? selectId = null)
     {
         profiles = store.Load();
-        ProfilesList.ItemsSource = profiles;
+        RefreshProfileItems();
         SwitchControlProfile? profile =
             profiles.FirstOrDefault(candidate => candidate.Id == selectId) ?? profiles.FirstOrDefault();
         SelectAndLoad(profile);
     }
 
+    private void RefreshProfileItems()
+    {
+        string? activeId = activeProfileId();
+        profileItems = profiles
+            .Select(profile => new ProfileListItem(profile, profile.Id == activeId))
+            .ToArray();
+        ProfilesList.ItemsSource = profileItems;
+    }
+
     private void ProfilesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
         if (suppressSelectionChange ||
-            ProfilesList.SelectedItem is not SwitchControlProfile profile ||
-            profile.Id == selected?.Id)
+            ProfilesList.SelectedItem is not ProfileListItem item ||
+            item.Profile.Id == selected?.Id)
         {
             return;
         }
 
+        SwitchControlProfile profile = item.Profile;
         if (isDirty)
         {
             string targetId = profile.Id;
@@ -181,7 +194,9 @@ private void LoadProfile(SwitchControlProfile profile, bool transient = false)
         isEditable = !profile.IsBuiltIn && profile.Id != activeProfileId();
         isTransient = transient;
         ProfileName.Text = profile.Name;
-        ProfileName.IsEnabled = isEditable;
+        ProfileName.IsEnabled = true;
+        ProfileName.IsReadOnly = !isEditable;
+        ProfileName.IsTabStop = true;
         ReadOnlyMessage.Text = profile.IsBuiltIn
             ? "Built-in profiles are read-only. Duplicate this profile to customize it."
             : isEditable
@@ -229,12 +244,13 @@ private void Duplicate_Click(object sender, RoutedEventArgs e)
     private void EditUnsaved(SwitchControlProfile profile)
     {
         profiles = [.. profiles, profile];
-        ProfilesList.ItemsSource = profiles;
+        RefreshProfileItems();
+        ProfileListItem item = profileItems.Single(candidate => candidate.Profile.Id == profile.Id);
         suppressSelectionChange = true;
-        ProfilesList.SelectedItem = profile;
+        ProfilesList.SelectedItem = item;
         suppressSelectionChange = false;
         LoadProfile(profile, transient: true);
-        ProfilesList.ScrollIntoView(profile);
+        ProfilesList.ScrollIntoView(item);
     }
 
     private void Save_Click(object sender, RoutedEventArgs e) => TrySave();
@@ -310,7 +326,9 @@ private bool DiscardPendingChanges()
     private void SelectAndLoad(SwitchControlProfile? profile)
     {
         suppressSelectionChange = true;
-        ProfilesList.SelectedItem = profile;
+        ProfilesList.SelectedItem = profile is null
+            ? null
+            : profileItems.FirstOrDefault(item => item.Profile.Id == profile.Id);
         suppressSelectionChange = false;
         if (profile is not null)
         {
@@ -321,10 +339,39 @@ private void SelectAndLoad(SwitchControlProfile? profile)
     private void RestoreSelectedProfile()
     {
         suppressSelectionChange = true;
-        ProfilesList.SelectedItem = selected;
+        ProfilesList.SelectedItem = selected is null
+            ? null
+            : profileItems.FirstOrDefault(item => item.Profile.Id == selected.Id);
         suppressSelectionChange = false;
     }
 
+    private void Window_PreviewKeyDown(object sender, WpfKeyEventArgs e)
+    {
+        e.Handled = HandleKeyboardShortcut(
+            e.Key,
+            Keyboard.Modifiers,
+            Keyboard.FocusedElement is System.Windows.Controls.ComboBox { IsDropDownOpen: true });
+    }
+
+    internal bool HandleKeyboardShortcut(
+        Key key,
+        ModifierKeys modifiers,
+        bool isComboBoxOpen = false)
+    {
+        if (key == Key.S && modifiers == ModifierKeys.Control && SaveButton.IsEnabled)
+        {
+            return TrySave();
+        }
+
+        if (key == Key.Escape && modifiers == ModifierKeys.None && !isComboBoxOpen)
+        {
+            Close();
+            return true;
+        }
+
+        return false;
+    }
+
     private void RefreshDirtyState()
     {
         if (suppressDirtyTracking || cleanSnapshot is null) return;
@@ -408,6 +455,21 @@ private sealed record BindingEditSnapshot(
         SwitchBindingType Type,
         string Value);
 
+    private sealed record ProfileListItem(
+        SwitchControlProfile Profile,
+        bool IsActive)
+    {
+        public string Name => Profile.Name;
+        public bool IsBuiltIn => Profile.IsBuiltIn;
+        public string AccessibleName => IsBuiltIn && IsActive
+            ? $"{Name}, built-in, active"
+            : IsBuiltIn
+                ? $"{Name}, built-in"
+                : IsActive
+                    ? $"{Name}, active"
+                    : Name;
+    }
+
     private sealed record BindingTypeOption(
         SwitchBindingType Value,
         string Label);
@@ -434,6 +496,8 @@ public BindingRowViewModel(int switchId)
         public string TypeAutomationName => $"Switch {SwitchId} action type";
         public string ValueAutomationName => $"Switch {SwitchId} action value";
         public IReadOnlyList<BindingTypeOption> Types { get; } = BindingTypes;
+        public string SelectedTypeLabel =>
+            BindingTypes.First(option => option.Value == SelectedType).Label;
 
         public SwitchBindingType SelectedType
         {
@@ -451,10 +515,12 @@ public SwitchBindingType SelectedType
                     SetRawValue("");
                 }
                 Changed();
+                Changed(nameof(SelectedTypeLabel));
                 Changed(nameof(ValueOptions));
                 Changed(nameof(ValueHelp));
                 Changed(nameof(FeedbackText));
                 Changed(nameof(HasValidationError));
+                Changed(nameof(ReadOnlyValueDisplay));
             }
         }
 
@@ -470,6 +536,11 @@ public string ValueDisplay
             set => SetRawValue(RawValue(SelectedType, value));
         }
 
+        public string ReadOnlyValueDisplay =>
+            SelectedType == SwitchBindingType.None || string.IsNullOrWhiteSpace(ValueDisplay)
+                ? "No value"
+                : ValueDisplay;
+
         public bool IsEditable
         {
             get => isEditable;
@@ -477,11 +548,14 @@ private set
             {
                 isEditable = value;
                 Changed();
+                Changed(nameof(IsReadOnly));
                 Changed(nameof(FeedbackText));
                 Changed(nameof(HasValidationError));
             }
         }
 
+        public bool IsReadOnly => !IsEditable;
+
         public IReadOnlyList<BindingValueOption> ValueOptions => SelectedType switch
         {
             SwitchBindingType.Key => KeyOptions,
@@ -582,6 +656,7 @@ private void SetRawValue(string newValue)
             value = newValue;
             Changed(nameof(Value));
             Changed(nameof(ValueDisplay));
+            Changed(nameof(ReadOnlyValueDisplay));
             Changed(nameof(FeedbackText));
             Changed(nameof(HasValidationError));
         }
diff --git a/src/SwitchifyPc.Tests/ButtonStyleTests.cs b/src/SwitchifyPc.Tests/ButtonStyleTests.cs
index 3e47f0a..1da262a 100644
--- a/src/SwitchifyPc.Tests/ButtonStyleTests.cs
+++ b/src/SwitchifyPc.Tests/ButtonStyleTests.cs
@@ -4,8 +4,13 @@
 using SwitchifyPc.App;
 using SwitchifyPc.Core.SwitchControl;
 using WpfBorder = System.Windows.Controls.Border;
+using WpfButton = System.Windows.Controls.Button;
+using WpfComboBox = System.Windows.Controls.ComboBox;
 using WpfControl = System.Windows.Controls.Control;
 using WpfControlTemplate = System.Windows.Controls.ControlTemplate;
+using WpfListBoxItem = System.Windows.Controls.ListBoxItem;
+using WpfSystemColors = System.Windows.SystemColors;
+using WpfTextBox = System.Windows.Controls.TextBox;
 
 namespace SwitchifyPc.Tests;
 
@@ -66,6 +71,52 @@ public void ProfileWindowPrimaryButtonStyleUsesRedHoverBrush()
         });
     }
 
+    [Fact]
+    public void ProfileWindowInteractiveStylesUseSystemKeyboardFocusBrush()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(SwitchifyPc.App.Themes.AppTheme.Light);
+            SwitchControlProfileWindow window = new(new StaticProfileStore(), () => null);
+            try
+            {
+                AssertTemplateFocusBrush(
+                    Assert.IsType<Style>(window.Resources[typeof(WpfButton)]),
+                    UIElement.IsKeyboardFocusedProperty,
+                    WpfBorder.BorderBrushProperty,
+                    "Root");
+                AssertTemplateFocusBrush(
+                    Assert.IsType<Style>(window.FindResource("PrimaryButton")),
+                    UIElement.IsKeyboardFocusedProperty,
+                    WpfBorder.BorderBrushProperty,
+                    "Root");
+                AssertTemplateFocusBrush(
+                    Assert.IsType<Style>(window.Resources[typeof(WpfListBoxItem)]),
+                    UIElement.IsKeyboardFocusedProperty,
+                    WpfBorder.BorderBrushProperty,
+                    "Root");
+                AssertTemplateFocusBrush(
+                    Assert.IsType<Style>(window.Resources[typeof(WpfComboBox)]),
+                    UIElement.IsKeyboardFocusWithinProperty,
+                    WpfBorder.BorderBrushProperty,
+                    "DropDownToggle");
+
+                Style textBox = Assert.IsType<Style>(window.Resources[typeof(WpfTextBox)]);
+                Trigger textFocus = Assert.IsType<Trigger>(
+                    Assert.Single(
+                        textBox.Triggers.OfType<Trigger>(),
+                        trigger => trigger.Property == UIElement.IsKeyboardFocusWithinProperty));
+                Assert.Contains(textFocus.Setters.OfType<Setter>(), setter =>
+                    setter.Property == WpfControl.BorderBrushProperty &&
+                    IsDynamicResource(setter.Value, WpfSystemColors.HighlightBrushKey));
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
     private static void AssertPrimaryButtonStyleUsesRedHoverBrush(FrameworkElement element)
     {
         Style style = Assert.IsType<Style>(element.FindResource("PrimaryButton"));
@@ -86,10 +137,30 @@ private static void AssertPrimaryButtonStyleUsesRedHoverBrush(FrameworkElement e
             IsDynamicResource(setter.Value, "BrandPrimaryHover"));
     }
 
-    private static bool IsDynamicResource(object value, string resourceKey)
+    private static void AssertTemplateFocusBrush(
+        Style style,
+        DependencyProperty triggerProperty,
+        DependencyProperty setterProperty,
+        string targetName)
+    {
+        WpfControlTemplate template = Assert.IsType<WpfControlTemplate>(
+            Assert.Single(
+                style.Setters.OfType<Setter>(),
+                setter => setter.Property == WpfControl.TemplateProperty).Value);
+        Trigger focusTrigger = Assert.IsType<Trigger>(
+            Assert.Single(
+                template.Triggers.OfType<Trigger>(),
+                trigger => trigger.Property == triggerProperty));
+        Assert.Contains(focusTrigger.Setters.OfType<Setter>(), setter =>
+            setter.TargetName == targetName &&
+            setter.Property == setterProperty &&
+            IsDynamicResource(setter.Value, WpfSystemColors.HighlightBrushKey));
+    }
+
+    private static bool IsDynamicResource(object value, object resourceKey)
     {
         return value is DynamicResourceExtension resource &&
-            string.Equals(resource.ResourceKey?.ToString(), resourceKey, StringComparison.Ordinal);
+            Equals(resource.ResourceKey, resourceKey);
     }
 
     private static void RunOnSta(Action action)
diff --git a/src/SwitchifyPc.Tests/SwitchControlProfileWindowTests.cs b/src/SwitchifyPc.Tests/SwitchControlProfileWindowTests.cs
index 7a4c84b..7bd88fb 100644
--- a/src/SwitchifyPc.Tests/SwitchControlProfileWindowTests.cs
+++ b/src/SwitchifyPc.Tests/SwitchControlProfileWindowTests.cs
@@ -2,6 +2,7 @@
 using System.Windows;
 using System.Windows.Automation;
 using System.Windows.Controls;
+using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Shell;
 using SwitchifyPc.App;
@@ -193,10 +194,12 @@ public void ProfileSelectionResolvesUnsavedChanges(
 
                 WpfListBox profiles = Assert.IsType<WpfListBox>(window.FindName("ProfilesList"));
                 profiles.SelectedItem = profiles.Items
-                    .Cast<SwitchControlProfile>()
-                    .First(profile => profile.IsBuiltIn);
+                    .Cast<object>()
+                    .First(item => ProfileForItem(item).IsBuiltIn);
 
-                Assert.Equal(selectedName, Assert.IsType<SwitchControlProfile>(profiles.SelectedItem).Name);
+                object? selectedItem = profiles.SelectedItem;
+                Assert.NotNull(selectedItem);
+                Assert.Equal(selectedName, ProfileForItem(selectedItem).Name);
                 Assert.Equal(storedName, store.CustomProfiles.Single().Name);
             }
             finally
@@ -261,10 +264,12 @@ public void InvalidProfilePreventsSelectionAndClosingWhenSaving()
 
                 WpfListBox profiles = Assert.IsType<WpfListBox>(window.FindName("ProfilesList"));
                 profiles.SelectedItem = profiles.Items
-                    .Cast<SwitchControlProfile>()
-                    .First(profile => profile.IsBuiltIn);
+                    .Cast<object>()
+                    .First(item => ProfileForItem(item).IsBuiltIn);
 
-                Assert.Equal("Custom profile", Assert.IsType<SwitchControlProfile>(profiles.SelectedItem).Name);
+                object? selectedItem = profiles.SelectedItem;
+                Assert.NotNull(selectedItem);
+                Assert.Equal("Custom profile", ProfileForItem(selectedItem).Name);
                 Assert.Contains(
                     "Switch 1",
                     Assert.IsType<TextBlock>(window.FindName("ValidationMessage")).Text);
@@ -438,6 +443,100 @@ public void ProfileWindowLoadsWithDarkTheme()
         });
     }
 
+    [Fact]
+    public void BuiltInAndActiveProfilesExposeBadgesAndFocusableReadOnlyValues()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(AppTheme.Light);
+            SwitchControlProfileWindow window = new(
+                new StaticProfileStore(),
+                () => SwitchControlProfiles.Grid3Id);
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                Assert.Equal(
+                    2,
+                    ControlsByAutomationName<Border>(window, "Built-in profile").Count(border => border.IsVisible));
+                Assert.Single(
+                    ControlsByAutomationName<Border>(window, "Active profile"),
+                    border => border.IsVisible);
+
+                WpfTextBox profileName = Assert.IsType<WpfTextBox>(window.FindName("ProfileName"));
+                Assert.True(profileName.IsEnabled);
+                Assert.True(profileName.IsReadOnly);
+                Assert.True(profileName.IsTabStop);
+
+                WpfComboBox hiddenEditor = Assert.IsType<WpfComboBox>(
+                    ControlByAutomationName<WpfComboBox>(window, "Switch 1 action type"));
+                Assert.Equal(Visibility.Collapsed, hiddenEditor.Visibility);
+                WpfTextBox readOnlyAction = Assert.IsType<WpfTextBox>(
+                    ControlByAutomationName<WpfTextBox>(window, "Switch 1 action type"));
+                WpfTextBox readOnlyValue = Assert.IsType<WpfTextBox>(
+                    ControlByAutomationName<WpfTextBox>(window, "Switch 1 action value"));
+                Assert.Equal(Visibility.Visible, readOnlyAction.Visibility);
+                Assert.True(readOnlyAction.IsReadOnly);
+                Assert.True(readOnlyAction.IsTabStop);
+                Assert.True(readOnlyValue.IsReadOnly);
+                Assert.True(readOnlyValue.IsTabStop);
+                Assert.Equal("No value", readOnlyValue.Text);
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
+    [Fact]
+    public void ProfileActionsExposeAccessKeysAndShortcutHelp()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(AppTheme.Light);
+            SwitchControlProfileWindow window = CreateWindow();
+            try
+            {
+                window.Show();
+                window.UpdateLayout();
+
+                AssertAccessKey(window, "New profile", "_New", "Alt+N");
+                AssertAccessKey(window, "Duplicate profile", "D_uplicate", "Alt+U");
+                AssertAccessKey(window, "Delete profile", "_Delete", "Alt+D");
+                AssertAccessKey(window, "Cancel changes", "_Cancel changes", "Alt+C");
+                AssertAccessKey(window, "Save profile", "_Save", "Ctrl+S or Alt+S");
+            }
+            finally
+            {
+                window.Close();
+            }
+        });
+    }
+
+    [Fact]
+    public void ControlSavesAndEscapeClosesWithoutMakingEnterAWindowShortcut()
+    {
+        RunOnSta(() =>
+        {
+            WpfTestApplication.ApplyTheme(AppTheme.Light);
+            MutableProfileStore store = new();
+            SwitchControlProfileWindow window = CreateWindow(store, () => MessageBoxResult.No);
+            window.Show();
+            window.UpdateLayout();
+            SelectCustomProfile(window);
+            Assert.IsType<WpfTextBox>(window.FindName("ProfileName")).Text = "Keyboard profile";
+
+            Assert.True(window.HandleKeyboardShortcut(Key.S, ModifierKeys.Control));
+            Assert.Equal("Keyboard profile", store.CustomProfiles.Single().Name);
+            Assert.False(window.HandleKeyboardShortcut(Key.Enter, ModifierKeys.None));
+            Assert.True(window.IsVisible);
+            Assert.True(window.HandleKeyboardShortcut(Key.Escape, ModifierKeys.None));
+            Assert.False(window.IsVisible);
+        });
+    }
+
     private static SwitchControlProfileWindow CreateWindow() =>
         new(new StaticProfileStore(), () => null);
 
@@ -450,8 +549,8 @@ private static void SelectCustomProfile(SwitchControlProfileWindow window)
     {
         WpfListBox profiles = Assert.IsType<WpfListBox>(window.FindName("ProfilesList"));
         profiles.SelectedItem = profiles.Items
-            .Cast<SwitchControlProfile>()
-            .Single(profile => !profile.IsBuiltIn);
+            .Cast<object>()
+            .Single(item => !ProfileForItem(item).IsBuiltIn);
     }
 
     private static void RunOnSta(Action action)
@@ -505,6 +604,20 @@ node is T control &&
         return result;
     }
 
+    private static IReadOnlyList<T> ControlsByAutomationName<T>(DependencyObject root, string name)
+        where T : DependencyObject
+    {
+        List<T> results = [];
+        Collect(root, node =>
+        {
+            if (node is T control && AutomationProperties.GetName(control) == name)
+            {
+                results.Add(control);
+            }
+        });
+        return results;
+    }
+
     private static IReadOnlyList<string> ButtonContent(DependencyObject root)
     {
         List<string> content = [];
@@ -522,12 +635,25 @@ private static IReadOnlyList<string> ItemLabels(ItemsControl items) =>
             .Cast<string>()
             .ToArray();
 
+    private static void AssertAccessKey(
+        DependencyObject root,
+        string automationName,
+        string content,
+        string helpText)
+    {
+        WpfButton button = Assert.IsType<WpfButton>(ButtonByAutomationName(root, automationName));
+        Assert.Equal(content, Assert.IsType<string>(button.Content));
+        Assert.Equal(helpText, AutomationProperties.GetHelpText(button));
+    }
+
     private static WpfButton ButtonByContent(DependencyObject root, string content)
     {
         WpfButton? result = null;
         Collect(root, node =>
         {
-            if (result is null && node is WpfButton { Content: string text } button && text == content)
+            if (result is null &&
+                node is WpfButton { Content: string text } button &&
+                text.Replace("_", "", StringComparison.Ordinal) == content)
             {
                 result = button;
             }
@@ -535,6 +661,10 @@ private static WpfButton ButtonByContent(DependencyObject root, string content)
         return Assert.IsType<WpfButton>(result);
     }
 
+    private static SwitchControlProfile ProfileForItem(object item) =>
+        Assert.IsType<SwitchControlProfile>(
+            item.GetType().GetProperty("Profile")?.GetValue(item));
+
     private static void Collect(DependencyObject node, Action<DependencyObject> visit)
     {
         visit(node);