diff --git a/src/VisualStudio/Core/Impl/Options/GridOptionPreviewControl.xaml b/src/VisualStudio/Core/Impl/Options/GridOptionPreviewControl.xaml
index 3f46cc8b101b9..402e414c60b31 100644
--- a/src/VisualStudio/Core/Impl/Options/GridOptionPreviewControl.xaml
+++ b/src/VisualStudio/Core/Impl/Options/GridOptionPreviewControl.xaml
@@ -87,23 +87,25 @@
                 </GroupStyle>
             </DataGrid.GroupStyle>
             <DataGrid.Columns>
-                <DataGridTextColumn
+                <DataGridTemplateColumn
                     x:Name="description" 
                     Header="{x:Static local:GridOptionPreviewControl.DescriptionHeader}"
-                    Binding="{Binding Description, Mode=OneWay}" 
                     Width="4.5*"
                     IsReadOnly="True">
-                    <DataGridTextColumn.ElementStyle>
-                        <Style TargetType="TextBlock">
-                            <Setter Property="Margin" Value="{Binding DescriptionMargin, Converter={StaticResource MarginConverter}}" />
-                            <Setter Property="Padding" Value="{StaticResource ResourceKey=cellPadding}" />
-                            <Setter Property="VerticalAlignment" Value="Center"/>
-                            <Setter Property="HorizontalAlignment" Value="Left" />
-                            <Setter Property="TextWrapping" Value="Wrap" />
-                            <Setter Property="AutomationProperties.Name" Value="{Binding GroupName}" />
-                        </Style>
-                    </DataGridTextColumn.ElementStyle>
-                </DataGridTextColumn>
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <local:TextBlockWithDataItemControlType
+                                Text="{Binding Description, Mode=OneWay}"
+                                Margin="{Binding DescriptionMargin, Converter={StaticResource MarginConverter}}"
+                                Padding="{StaticResource ResourceKey=cellPadding}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Left"
+                                TextWrapping="Wrap"
+                                AutomationProperties.Name="{Binding GroupNameAndDescription}"
+                                Focusable="True"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
                 <DataGridTemplateColumn 
                     x:Name="preference" 
                     Header="{x:Static local:GridOptionPreviewControl.PreferenceHeader}"
diff --git a/src/VisualStudio/Core/Impl/Options/Style/AbstractCodeStyleOptionViewModel.cs b/src/VisualStudio/Core/Impl/Options/Style/AbstractCodeStyleOptionViewModel.cs
index 7cf94da10da49..3ea8dbc698686 100644
--- a/src/VisualStudio/Core/Impl/Options/Style/AbstractCodeStyleOptionViewModel.cs
+++ b/src/VisualStudio/Core/Impl/Options/Style/AbstractCodeStyleOptionViewModel.cs
@@ -29,6 +29,7 @@ internal abstract class AbstractCodeStyleOptionViewModel : AbstractNotifyPropert
         public string Description { get; set; }
         public double DescriptionMargin { get; set; } = 12d;
         public string GroupName { get; set; }
+        public string GroupNameAndDescription { get; set; }
         public List<CodeStylePreference> Preferences { get; set; }
         public List<NotificationOptionViewModel> NotificationPreferences { get; set; }
 
@@ -56,6 +57,7 @@ public AbstractCodeStyleOptionViewModel(
             Preferences = preferences ?? GetDefaultPreferences();
             NotificationPreferences = notificationPreferences ?? GetDefaultNotifications();
             GroupName = groupName;
+            GroupNameAndDescription = $"{groupName}, {description}";
         }
 
         private static List<NotificationOptionViewModel> GetDefaultNotifications()
diff --git a/src/VisualStudio/Core/Impl/Options/TextBlockWithDataItemControlType.cs b/src/VisualStudio/Core/Impl/Options/TextBlockWithDataItemControlType.cs
new file mode 100644
index 0000000000000..0c38beb315b7a
--- /dev/null
+++ b/src/VisualStudio/Core/Impl/Options/TextBlockWithDataItemControlType.cs
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Windows.Automation.Peers;
+using System.Windows.Controls;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.Options
+{
+    internal class TextBlockWithDataItemControlType : TextBlock
+    {
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new TextBlockWithDataItemControlTypeAutomationPeer(this);
+        }
+
+        private class TextBlockWithDataItemControlTypeAutomationPeer : TextBlockAutomationPeer
+        {
+            public TextBlockWithDataItemControlTypeAutomationPeer(TextBlock owner) : base(owner)
+            {
+            }
+
+            protected override AutomationControlType GetAutomationControlTypeCore()
+            {
+                return AutomationControlType.DataItem;
+            }
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj b/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
index 736e1908de723..8555ff20ffd33 100644
--- a/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
+++ b/src/VisualStudio/Core/Impl/ServicesVisualStudioImpl.csproj
@@ -252,6 +252,7 @@
       <DependentUpon>SymbolSpecificationDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Options\Style\NamingPreferences\SymbolSpecification\SymbolSpecificationViewModel.cs" />
+    <Compile Include="Options\TextBlockWithDataItemControlType.cs" />
     <Compile Include="ProjectSystem\CPS\CPSProject.cs" />
     <Compile Include="ProjectSystem\CPS\CPSCodeModelFactory.cs" />
     <Compile Include="ProjectSystem\CPS\CPSProjectFactory.cs" />