diff --git a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs
index 11138b0..c998681 100644
--- a/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs
+++ b/QuickLook.Plugin/QuickLook.Plugin.VideoViewer/ViewerPanel.xaml.cs
@@ -130,7 +130,7 @@ namespace QuickLook.Plugin.VideoViewer
 
         private void AutoHideViedoControlContainer(object sender, EventArgs e)
         {
-            if (ShowVideo)
+            if (!ShowVideo)
                 return;
 
             if (videoControlContainer.IsMouseOver)
diff --git a/QuickLook/Helpers/WindowHelper.cs b/QuickLook/Helpers/WindowHelper.cs
index cbe342c..e6e646b 100644
--- a/QuickLook/Helpers/WindowHelper.cs
+++ b/QuickLook/Helpers/WindowHelper.cs
@@ -105,7 +105,7 @@ namespace QuickLook.Helpers
         {
             var mmi = (MinMaxInfo) Marshal.PtrToStructure(lParam, typeof(MinMaxInfo));
 
-            // Adjust the maximized size and position to fit the work area of the correct monitor
+            // Adjust the maximized size and position to fit the work area of the current monitor
             var currentScreen = Screen.FromHandle(hwnd);
             var workArea = currentScreen.WorkingArea;
             var monitorArea = currentScreen.Bounds;
diff --git a/QuickLook/ViewerWindow.xaml b/QuickLook/ViewerWindow.xaml
index 61a8181..f1d2db5 100644
--- a/QuickLook/ViewerWindow.xaml
+++ b/QuickLook/ViewerWindow.xaml
@@ -27,16 +27,14 @@
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         </ResourceDictionary>
     </controls:MainWindowBase.Resources>
+    <WindowChrome.WindowChrome>
+        <WindowChrome CaptionHeight="0" CornerRadius="0" GlassFrameThickness="0,0,0,1" 
+                      ResizeBorderThickness="{Binding ContextObject.CanResize, Converter={StaticResource BooleanToResizeBorderThicknessConverter}, ElementName=mainWindow}"
+                      UseAeroCaptionButtons="False" />
+    </WindowChrome.WindowChrome>
     <controls:MainWindowBase.Style>
         <Style TargetType="controls:MainWindowBase">
             <Setter Property="Foreground" Value="{DynamicResource WindowTextForeground}" />
-            <Setter Property="WindowChrome.WindowChrome">
-                <Setter.Value>
-                    <WindowChrome CaptionHeight="0" CornerRadius="0" GlassFrameThickness="0,0,0,1" 
-                                  ResizeBorderThickness="{Binding ContextObject.CanResize, Converter={StaticResource BooleanToResizeBorderThicknessConverter}, ElementName=mainWindow}"
-                                  UseAeroCaptionButtons="False" />
-                </Setter.Value>
-            </Setter>
         </Style>
     </controls:MainWindowBase.Style>
     <Grid x:Name="windowFrameContainer" Background="{DynamicResource MainWindowBackground}">
@@ -68,6 +66,9 @@
                                            GlassVisibility="{Binding ContextObject.TitlebarBlurVisibility, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}"
                                            NoiseVisibility="{Binding ContextObject.TitlebarBlurVisibility, ElementName=mainWindow, Converter={StaticResource BooleanToVisibilityConverter}}" />
                 <DockPanel>
+                    <DockPanel.Effect>
+                        <DropShadowEffect ShadowDepth="0" BlurRadius="2" Opacity="0.7" Color="#B2FFFFFF" />
+                    </DockPanel.Effect>
                     <Button DockPanel.Dock="Right" x:Name="buttonCloseWindow"
                                 Style="{StaticResource CaptionCloseButtonStyle}" Content="&#xE894;" />
                     <Button DockPanel.Dock="Right" x:Name="buttonWindowStatus"
diff --git a/QuickLook/ViewerWindow.xaml.cs b/QuickLook/ViewerWindow.xaml.cs
index fbae5f8..4d8029b 100644
--- a/QuickLook/ViewerWindow.xaml.cs
+++ b/QuickLook/ViewerWindow.xaml.cs
@@ -373,6 +373,10 @@ namespace QuickLook
 
             void AddToInlines(string str, string replaceWith)
             {
+                // limit str length
+                if (replaceWith.Length > 16)
+                    replaceWith = replaceWith.Substring(0, 14) + "…" + replaceWith.Substring(replaceWith.Length - 2);
+
                 str = TranslationHelper.GetString(str);
                 var elements = str.Split(new[] {"{0}"}, StringSplitOptions.None).ToList();
                 while (elements.Count < 2)