diff --git a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
index 87cb270598..7a755ba48e 100644
--- a/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
+++ b/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PasswordBox.xaml
@@ -15,6 +15,8 @@
     <converters:NotConverter x:Key="NotConverter" />
     <converters:MathConverter x:Key="MathMultiplyConverter" Operation="Multiply" />
     <converters:FloatingHintOffsetCalculationConverter x:Key="FloatingHintOffsetCalculationConverter" />
+    <converters:CursorConverter x:Key="ArrowCursorConverter" FallbackCursor="Arrow" />
+    <converters:CursorConverter x:Key="IBeamCursorConverter" FallbackCursor="IBeam" />
 
     <Style x:Key="MaterialDesignPasswordBox" TargetType="{x:Type PasswordBox}">
         <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
@@ -35,7 +37,6 @@
         <Setter Property="wpf:TextFieldAssist.UnderlineBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
         <Setter Property="wpf:HintAssist.Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
         <Setter Property="ContextMenu" Value="{StaticResource MaterialDesignDefaultContextMenu}" />
-        <Setter Property="Cursor" Value="Arrow" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
         <Setter Property="FontFamily" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.FontFamily)}" />
         <Setter Property="PasswordChar" Value="●" />
@@ -43,7 +44,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type PasswordBox}">
-                    <Grid>
+                    <Grid Cursor="{TemplateBinding Cursor, Converter={StaticResource ArrowCursorConverter}}">
                         <Border
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
@@ -92,7 +93,7 @@
                                             Grid.Column="1"
                                             Panel.ZIndex="1"
                                             wpf:ScrollViewerAssist.IgnorePadding="True"
-                                            Cursor="IBeam"
+                                            Cursor="{TemplateBinding Cursor, Converter={StaticResource IBeamCursorConverter}}"
                                             Focusable="false"
                                             HorizontalScrollBarVisibility="Hidden"
                                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"