diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
index 3cd24cb5..8184169f 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.es.resx
@@ -457,7 +457,7 @@
     <value>CoverFlow</value>
   </data>
   <data name="PlsEnterKey" xml:space="preserve">
-    <value>Buscar</value> <!-- "Buscar" is more like "Search". I think it fits better @jhm-ciberman -->
+    <value>Buscar</value>
   </data>
   <data name="OpenNoNonClientAreaDragableWindow" xml:space="preserve">
     <value>Abrir ventana arrastrable sin bordes</value>
@@ -804,4 +804,4 @@
   <data name="Watermark" xml:space="preserve">
     <value>Watermark</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index 9a0bde7e..f33036c4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -28,7 +28,7 @@
     </Border.Resources>
     <DockPanel>
         <Button Command="{Binding OpenPracticalDemoCmd}" DockPanel.Dock="Top" HorizontalAlignment="Stretch" Margin="10,10,10,4" Content="{ex:Lang Key={x:Static langs:LangKeys.PracticalDemos}}" BorderThickness="0" Background="{DynamicResource SecondaryRegionBrush}"/>
-        <TabControl SelectionChanged="TabControl_OnSelectionChanged" ItemContainerStyle="{StaticResource TabItemTransparent}" ItemsSource="{Binding DemoInfoCollection}" Style="{StaticResource TabControlInLine}" Background="Transparent" SelectedIndex="0">
+        <TabControl BorderThickness="0 1 0 0" SelectionChanged="TabControl_OnSelectionChanged" ItemContainerStyle="{StaticResource TabItemTransparent}" ItemsSource="{Binding DemoInfoCollection}" Style="{StaticResource TabControlInLine}" Background="Transparent" SelectedIndex="0">
             <TabControl.ItemTemplate>
                 <DataTemplate>
                     <TextBlock Text="{ex:Lang Key={Binding Title}}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
index f71d6f11..3ea5647e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
@@ -22,7 +22,7 @@ public partial class MainWindowContent
         ButtonShiftOut.Collapse();
         GridSplitter.IsEnabled = false;
 
-        double targetValue = -ColumnDefinitionLeft.Width.Value;
+        double targetValue = -ColumnDefinitionLeft.MaxWidth;
         _columnDefinitionWidth = ColumnDefinitionLeft.Width;
 
         DoubleAnimation animation = AnimationHelper.CreateAnimation(targetValue, milliseconds: 100);