diff --git a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
index 12dce7090..b9788ab89 100644
--- a/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
+++ b/src/Wpf.Ui/Controls/NumberBox/NumberBox.xaml
@@ -82,6 +82,7 @@
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding Icon}"
                                     FontSize="16"
+                                    IsTabStop="False"
                                     Foreground="{TemplateBinding Foreground}" />
                                 <Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
                                     <Decorator
@@ -115,6 +116,7 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="clear"
                                     Cursor="Arrow"
+                                    IsTabStop="False"
                                     Foreground="{DynamicResource TextControlButtonForeground}">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="Dismiss24" />
@@ -138,6 +140,7 @@
                                     CommandParameter="increment"
                                     Cursor="Arrow"
                                     Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False"
                                     Visibility="Collapsed">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="ChevronUp24" />
@@ -162,6 +165,7 @@
                                     Cursor="Arrow"
                                     FontSize="{StaticResource NumberBoxButtonIconSize}"
                                     Foreground="{DynamicResource TextControlButtonForeground}"
+                                    IsTabStop="False"
                                     Visibility="Collapsed">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource NumberBoxButtonIconSize}" Symbol="ChevronDown24" />
@@ -175,6 +179,7 @@
                                     VerticalAlignment="Top"
                                     Content="{TemplateBinding Icon}"
                                     FontSize="16"
+                                    IsTabStop="False"
                                     Foreground="{TemplateBinding Foreground}" />
                             </Grid>
                         </Border>
diff --git a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
index 862188d46..6d02f27e8 100644
--- a/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
+++ b/src/Wpf.Ui/Controls/PasswordBox/PasswordBox.xaml
@@ -206,6 +206,7 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="clear"
                                     Cursor="Arrow"
+                                    IsTabStop="False"
                                     Foreground="{DynamicResource TextControlButtonForeground}">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Dismiss24" />
@@ -229,6 +230,7 @@
                                     Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                                     CommandParameter="reveal"
                                     Cursor="Arrow"
+                                    IsTabStop="False"
                                     Foreground="{DynamicResource TextControlButtonForeground}">
                                     <controls:Button.Icon>
                                         <controls:SymbolIcon FontSize="{StaticResource PasswordBoxButtonIconSize}" Symbol="Eye24" />
diff --git a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
index d7cfcb677..bbfc4cca1 100644
--- a/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
+++ b/src/Wpf.Ui/Controls/TextBox/TextBox.xaml
@@ -206,6 +206,7 @@
                         BorderBrush="Transparent"
                         Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
                         Cursor="Arrow"
+                        IsTabStop="False"
                         Foreground="{DynamicResource TextControlButtonForeground}">
                         <controls:Button.Icon>
                             <controls:SymbolIcon FontSize="{TemplateBinding FontSize}" Symbol="Dismiss24" />