From bd2fe20a78e43d7a985bdfdb9d6ffec2609401a7 Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Fri, 3 Jul 2020 11:02:17 +0200
Subject: [PATCH] Checking for IsTabStop

---
 src/Avalonia.Input/Navigation/TabNavigation.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Input/Navigation/TabNavigation.cs b/src/Avalonia.Input/Navigation/TabNavigation.cs
index dd50ea438a..cd377f1df6 100644
--- a/src/Avalonia.Input/Navigation/TabNavigation.cs
+++ b/src/Avalonia.Input/Navigation/TabNavigation.cs
@@ -219,7 +219,9 @@ namespace Avalonia.Input.Navigation
 
             if (parent != null)
             {
-                if (direction == NavigationDirection.Previous && parent.CanFocus())
+                if (direction == NavigationDirection.Previous &&
+                    parent.CanFocus() && 
+                    KeyboardNavigation.GetIsTabStop((InputElement) parent))
                 {
                     return parent;
                 }