diff --git a/DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml b/DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml
index 5ca0f8b..f9ca6ad 100644
--- a/DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml
+++ b/DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml
@@ -12,13 +12,13 @@
         <TextBox
             materialDesign:TextFieldAssist.DecorationVisibility="Hidden"
             BorderThickness="{Binding BorderThickness, ElementName=Root}"
-            Text="{Binding Password, ElementName=Root}"
+            Text="{Binding Password, ElementName=Root, UpdateSourceTrigger=PropertyChanged}"
             Visibility="{Binding IsRevealed, ElementName=Root, Converter={x:Static s:BoolToVisibilityConverter.Instance}}" />
         <PasswordBox
-            x:Name="PasswordBox"
+            materialDesign:PasswordBoxAssist.Password="{Binding Password, ElementName=Root, UpdateSourceTrigger=PropertyChanged}"
             materialDesign:TextFieldAssist.DecorationVisibility="Hidden"
             BorderThickness="{Binding BorderThickness, ElementName=Root}"
-            PasswordChanged="PasswordBox_OnPasswordChanged"
+            IsEnabled="False"
             Visibility="{Binding IsRevealed, ElementName=Root, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}}" />
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml.cs b/DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml.cs
index efe8fb1..13cc1a2 100644
--- a/DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml.cs
+++ b/DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml.cs
@@ -8,17 +8,7 @@ public partial class RevealablePasswordBox
         nameof(Password),
         typeof(string),
         typeof(RevealablePasswordBox),
-        new FrameworkPropertyMetadata(
-            string.Empty,
-            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-            (sender, args) =>
-            {
-                var revealablePasswordBox = (RevealablePasswordBox)sender;
-                var password = (string)args.NewValue;
-
-                revealablePasswordBox.PasswordBox.Password = password;
-            }
-        )
+        new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault)
     );
 
     public static readonly DependencyProperty IsRevealedProperty = DependencyProperty.Register(
@@ -44,7 +34,4 @@ public partial class RevealablePasswordBox
     {
         InitializeComponent();
     }
-
-    private void PasswordBox_OnPasswordChanged(object sender, RoutedEventArgs args) =>
-        Password = PasswordBox.Password;
 }
\ No newline at end of file