From c54098e75a36e0eeca92f5c274ba3deaafddc04b Mon Sep 17 00:00:00 2001
From: Nikola Metulev <nikolame@microsoft.com>
Date: Fri, 23 Jun 2017 16:04:55 -0700
Subject: [PATCH 1/2] removed tabstop behavior from scrollheader

---
 Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs
index 5e042bd0de3..9a5f3a9bd80 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs
@@ -29,6 +29,7 @@ public ScrollHeader()
         {
             DefaultStyleKey = typeof(ScrollHeader);
             HorizontalContentAlignment = HorizontalAlignment.Stretch;
+            IsTabStop = false;
         }
 
         /// <summary>

From 88799427e7ef5320a4c5d4152433a7c6dec98a22 Mon Sep 17 00:00:00 2001
From: Nikola Metulev <nikolame@microsoft.com>
Date: Fri, 23 Jun 2017 16:31:33 -0700
Subject: [PATCH 2/2] moved fix to default style

---
 Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs   | 1 -
 Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs b/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs
index 9a5f3a9bd80..5e042bd0de3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.cs
@@ -29,7 +29,6 @@ public ScrollHeader()
         {
             DefaultStyleKey = typeof(ScrollHeader);
             HorizontalContentAlignment = HorizontalAlignment.Stretch;
-            IsTabStop = false;
         }
 
         /// <summary>
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml
index acafd55b913..2521843c6f5 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/ScrollHeader/ScrollHeader.xaml
@@ -2,6 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
     <Style TargetType="controls:ScrollHeader">
+        <Setter Property="IsTabStop" Value="False"></Setter>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:ScrollHeader">