diff --git a/src/Avalonia.Input/FocusManager.cs b/src/Avalonia.Input/FocusManager.cs index a1f1478f51..474b212a21 100644 --- a/src/Avalonia.Input/FocusManager.cs +++ b/src/Avalonia.Input/FocusManager.cs @@ -75,7 +75,9 @@ namespace Avalonia.Input // If control is null, set focus to the topmost focus scope. foreach (var scope in GetFocusScopeAncestors(Current).Reverse().ToList()) { - if (_focusScopes.TryGetValue(scope, out var element) && element != null) + if (scope != Scope && + _focusScopes.TryGetValue(scope, out var element) && + element != null) { Focus(element, method); return;