diff --git a/src/Avalonia.Input/FocusManager.cs b/src/Avalonia.Input/FocusManager.cs index 37026d16f5..e5cc5a8557 100644 --- a/src/Avalonia.Input/FocusManager.cs +++ b/src/Avalonia.Input/FocusManager.cs @@ -79,7 +79,7 @@ namespace Avalonia.Input { IInputElement element; - if (_focusScopes.TryGetValue(scope, out element)) + if (_focusScopes.TryGetValue(scope, out element) && element != null) { Focus(element, method); return;