diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
index b3510d0f..00d06d5f 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
@@ -57,7 +57,7 @@
                                                                  RenderEnabled="{TemplateBinding IsEnabled}"
                                                                  RenderMouseOver="{Binding IsMouseOver, ElementName=IncreaseButton}"
                                                                  RenderPressed="{Binding IsPressed, ElementName=IncreaseButton}"/>
-                                            <ContentControl ContentTemplate="{StaticResource IncreaseGlyph}" Margin="5,1" />
+                                            <ContentControl ContentTemplate="{StaticResource IncreaseGlyph}" Margin="5,1" Focusable="False" />
                                         </Grid>
                                     </RepeatButton>
                                     <RepeatButton x:Name="DecreaseButton" SnapsToDevicePixels="True" Grid.Row="2" ClickMode="Press" IsTabStop="{Binding IsTabStop, RelativeSource={RelativeSource TemplatedParent}}" >
@@ -71,7 +71,7 @@
                                                                  RenderEnabled="{TemplateBinding IsEnabled}"
                                                                  RenderMouseOver="{Binding IsMouseOver, ElementName=DecreaseButton}"
                                                                  RenderPressed="{Binding IsPressed, ElementName=DecreaseButton}"/>
-                                            <ContentControl ContentTemplate="{StaticResource DecreaseGlyph}" Margin="5,1" />
+                                            <ContentControl ContentTemplate="{StaticResource DecreaseGlyph}" Margin="5,1" Focusable="False" />
                                         </Grid>
                                     </RepeatButton>
                                 </Grid>