diff --git a/ModernWpf.Controls/NavigationView/NavigationView.xaml b/ModernWpf.Controls/NavigationView/NavigationView.xaml
index 991f5e7e..0cb1d832 100644
--- a/ModernWpf.Controls/NavigationView/NavigationView.xaml
+++ b/ModernWpf.Controls/NavigationView/NavigationView.xaml
@@ -206,13 +206,9 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="IconBox" Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="IconColumn" Storyboard.TargetProperty="Width">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <GridLength>16</GridLength>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="IconColumn" Storyboard.TargetProperty="Width">
+                                            <DiscreteDoubleKeyFrame KeyTime="0" Value="16" />
+                                        </DoubleAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
diff --git a/ModernWpf.Controls/NavigationView/NavigationViewItem.cs b/ModernWpf.Controls/NavigationView/NavigationViewItem.cs
index 39784342..ea4d59ae 100644
--- a/ModernWpf.Controls/NavigationView/NavigationViewItem.cs
+++ b/ModernWpf.Controls/NavigationView/NavigationViewItem.cs
@@ -240,7 +240,11 @@ void UpdateNavigationViewItemToolTip()
             {
                 if (ShouldEnableToolTip())
                 {
-                    ToolTipService.SetToolTip(this, m_suggestedToolTipContent);
+                    // Don't SetToolTip with the same parameter because it close/re-open the ToolTip
+                    if (toolTipContent != m_suggestedToolTipContent)
+                    {
+                        ToolTipService.SetToolTip(this, m_suggestedToolTipContent);
+                    }
                 }
                 else
                 {