diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
index fead3455..e378fa50 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
@@ -356,6 +356,11 @@ namespace HandyControl.Controls
             if (VerifyData() && !IsSafeEnabled)
             {
                 SetCurrentValue(UnsafePasswordProperty, ActualPasswordBox.Password);
+
+                if (ShowPassword)
+                {
+                    _textBox.Text = ActualPasswordBox.Password;
+                }
             }
         }