diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
index 2d8ec15b..507053da 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
@@ -359,6 +359,15 @@ namespace HandyControl.Controls
             }
         }
 
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e) => VerifyData();
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            VerifyData();
+
+            if (!IsSafeEnabled && ShowPassword)
+            {
+                Password = _textBox.Text;
+                SetCurrentValue(UnsafePasswordProperty, Password);
+            }
+        }
     }
 }
\ No newline at end of file