diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index 86f6134ff0..2a9c470a07 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -884,6 +884,7 @@
                   <ToggleButton x:Name="RevealPasswordButton"
                                 Grid.Column="4"
                                 Height="Auto"
+                                Focusable="False"
                                 IsTabStop="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:PasswordBoxAssist.IsRevealButtonTabStop)}"
                                 Opacity="{TemplateBinding wpf:HintAssist.HintOpacity}"
                                 Padding="2,0,0,0"