diff --git a/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml b/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
index 63cea0d..b8880a8 100644
--- a/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
+++ b/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
@@ -291,7 +291,7 @@
                                          TextWrapping="NoWrap"
                                          VerticalAlignment="Stretch"
                                          Margin="0"
-                                         Text="{TemplateBinding Text}" />
+                                         Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, Path=Text}" />
                                 <Button x:Name="ActionButton"
                                         AutomationProperties.AccessibilityView="Raw"
                                         Background="Transparent"
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml b/ModernKeePass/Views/EntryDetailPage.xaml
index a1f8704..05c94d9 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml
+++ b/ModernKeePass/Views/EntryDetailPage.xaml
@@ -306,7 +306,7 @@
                                          Style="{StaticResource PasswordBoxStyle}"
                                          VerticalAlignment="Stretch"
                                          Margin="0"
-                                         Password="{TemplateBinding Password}"
+                                         Password="{Binding RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay, Path=Password}"
                                          IsPasswordRevealButtonEnabled="{TemplateBinding IsPasswordRevealEnabled}"/>
                                     <Button x:Name="ActionButton"
                                         AutomationProperties.AccessibilityView="Raw"
@@ -393,7 +393,7 @@
                             </Style>
                         </StackPanel.Resources>
                         <TextBlock x:Uid="EntryLogin" />
-                        <local:TextBoxWithButton x:Uid="LoginTextBox"  Text="{Binding UserName, Mode=TwoWay}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" IsEnabled="{Binding IsCurrentEntry}">
+                        <local:TextBoxWithButton x:Uid="LoginTextBox" Text="{Binding UserName, Mode=TwoWay}" Style="{StaticResource TextBoxWithButtonStyle}" ButtonSymbol="&#xE16F;" IsEnabled="{Binding IsCurrentEntry}">
                             <interactivity:Interaction.Behaviors>
                                 <core:EventTriggerBehavior EventName="ButtonClick">
                                     <actions:ClipboardAction Text="{Binding UserName}" />