diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index 40c10fe29fd..cb517b293dc 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -256,7 +256,7 @@ protected override void OnGotFocus(GotFocusEventArgs e)
         {
             base.OnGotFocus(e);
 
-            if (e.NavigationMethod == NavigationMethod.Directional)
+            if (e.NavigationMethod == NavigationMethod.Directional && e.Source is TabItem)
             {
                 e.Handled = UpdateSelectionFromEventSource(e.Source);
             }