diff --git a/src/modules/imageresizer/ui/Views/AccessibleHyperlink.cs b/src/modules/imageresizer/ui/Views/AccessibleHyperlink.cs
new file mode 100644
index 0000000000..c50ac57ffe
--- /dev/null
+++ b/src/modules/imageresizer/ui/Views/AccessibleHyperlink.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Automation.Peers;
+using System.Windows.Documents;
+
+namespace ImageResizer.Views
+{
+    public class AccessibleHyperlink : Hyperlink
+    {
+        public AutomationControlType ControlType { get; set; }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            var peer = new CustomizableHyperlinkAutomationPeer(this);
+
+            peer.ControlType = ControlType;
+            return peer;
+        }
+    }
+}
diff --git a/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml b/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
index d64509f537..7abef9b325 100644
--- a/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
+++ b/src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
@@ -114,18 +114,18 @@
                                         </ComboBox.ItemTemplate>
                                     </ComboBox>
                                     <TextBlock Grid.Column="6" Margin="5,0,0,0" VerticalAlignment="Center">
-                                        <Hyperlink Command="{Binding DataContext.RemoveSizeCommand,ElementName=_this}" CommandParameter="{Binding}">
+                                        <local:AccessibleHyperlink ControlType="Button"  Command="{Binding DataContext.RemoveSizeCommand,ElementName=_this}" CommandParameter="{Binding}">
                                             <Run Text="{x:Static p:Resources.Advanced_DeleteSize}"/>
-                                        </Hyperlink>
+                                        </local:AccessibleHyperlink>
                                     </TextBlock>
                                 </Grid>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
                     <TextBlock>
-                        <Hyperlink Command="{Binding AddSizeCommand}">
+                        <local:AccessibleHyperlink ControlType="Button" Command="{Binding AddSizeCommand}">
                             <Run Text="{x:Static p:Resources.Advanced_CreateSize}"/>
-                        </Hyperlink>
+                        </local:AccessibleHyperlink>
                     </TextBlock>
                 </StackPanel>
             </TabItem>
diff --git a/src/modules/imageresizer/ui/Views/CustomizableHyperlinkAutomationPeer.cs b/src/modules/imageresizer/ui/Views/CustomizableHyperlinkAutomationPeer.cs
new file mode 100644
index 0000000000..9732e7c64e
--- /dev/null
+++ b/src/modules/imageresizer/ui/Views/CustomizableHyperlinkAutomationPeer.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Windows.Automation.Peers;
+using System.Windows.Documents;
+
+namespace ImageResizer.Views
+{
+    public class CustomizableHyperlinkAutomationPeer : HyperlinkAutomationPeer
+    {
+        public CustomizableHyperlinkAutomationPeer(Hyperlink owner)
+            : base(owner)
+        {
+        }
+
+        public AutomationControlType ControlType { get; set; }
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+        {
+            return ControlType;
+        }
+    }
+}
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml b/src/modules/imageresizer/ui/Views/InputPage.xaml
index da76d69512..6ee6678e48 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -133,9 +133,9 @@
                 
                 <TextBlock VerticalAlignment="Center"
                            Visibility="{Binding ShowAdvancedSettings, Converter={StaticResource BoolValueConverter}}">
-                    <Hyperlink Command="{Binding ShowAdvancedCommand}">
+                    <local:AccessibleHyperlink ControlType="Button" Command="{Binding ShowAdvancedCommand}">
                         <Run Text="{x:Static p:Resources.Input_ShowAdvanced}"/>
-                    </Hyperlink>
+                    </local:AccessibleHyperlink>
                 </TextBlock>
                 
                 <Button Grid.Column="1"