diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml
index 8016e0ba..248fdfe9 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml
@@ -15,38 +15,12 @@
 
     <Style BasedOn="{StaticResource ScrollViewerBaseStyle}" TargetType="hc:ScrollViewer"/>
 
-    <Style x:Key="ScrollViewerUpRepeatButtonStyle" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
+    <Style x:Key="ScrollViewerUpDownRepeatButtonStyle" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
         <Setter Property="HorizontalAlignment" Value="Stretch"/>
         <Setter Property="Height" Value="10"/>
         <Setter Property="Padding" Value="0,2"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Visibility">
-            <Setter.Value>
-                <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
-                </MultiBinding>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ScrollViewerDownRepeatButtonStyle" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
-        <Setter Property="HorizontalAlignment" Value="Stretch"/>
-        <Setter Property="Height" Value="10"/>
-        <Setter Property="Padding" Value="0,2"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="Visibility">
-            <Setter.Value>
-                <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="100">
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
-                </MultiBinding>
-            </Setter.Value>
-        </Setter>
+        <Setter Property="ClickMode" Value="Hover"/>
     </Style>
     
     <ControlTemplate x:Key="ScrollViewerUpDownControlTemplate" TargetType="ScrollViewer">
@@ -56,9 +30,27 @@
                 <RowDefinition/>
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
-            <RepeatButton Style="{StaticResource ScrollViewerUpRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource UpGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Command="{x:Static ScrollBar.LineUpCommand}"/>
+            <RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource UpGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Command="{x:Static ScrollBar.LineUpCommand}">
+                <RepeatButton.Visibility>
+                    <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
+                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+                    </MultiBinding>
+                </RepeatButton.Visibility>
+            </RepeatButton>
             <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="1"/>
-            <RepeatButton Style="{StaticResource ScrollViewerDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource DownGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="2" Command="{x:Static ScrollBar.LineDownCommand}"/>
+            <RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource DownGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="2" Command="{x:Static ScrollBar.LineDownCommand}">
+                <RepeatButton.Visibility>
+                    <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="100">
+                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+                    </MultiBinding>
+                </RepeatButton.Visibility>
+            </RepeatButton>
         </Grid>
     </ControlTemplate>