diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs index 2a7006b0..d3ecc06e 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs @@ -58,6 +58,28 @@ namespace HandyControl.Controls _passwordBoxsGotFocusEventHandler = PasswordBoxsGotFocus; AddHandler(GotFocusEvent, _passwordBoxsGotFocusEventHandler); + + FocusPasswordBox(); + } + + private void FocusPasswordBox() + { + if (!IsFocused) + { + return; + } + + if (_panel.Children.Count == 0) + { + return; + } + + if (_panel.Children.OfType().Any(box => box.IsFocused)) + { + return; + } + + FocusManager.SetFocusedElement(this, _panel.Children[0]); } private void PasswordBoxsPasswordChanged(object sender, RoutedEventArgs e)