diff --git a/QuickLook/Controls/MainWindowBase.cs b/QuickLook/Controls/MainWindowBase.cs
index 1c9c040..cd1d99d 100644
--- a/QuickLook/Controls/MainWindowBase.cs
+++ b/QuickLook/Controls/MainWindowBase.cs
@@ -26,7 +26,7 @@ namespace QuickLook.Controls
     {
         public MainWindowBase()
         {
-            WindowStyle = WindowStyle.None;
+            //WindowStyle = WindowStyle.None;
 
             SourceInitialized += SourceInitializedHandler;
         }
diff --git a/QuickLook/ViewerWindow.Actions.cs b/QuickLook/ViewerWindow.Actions.cs
index 71107bd..d6e8ded 100644
--- a/QuickLook/ViewerWindow.Actions.cs
+++ b/QuickLook/ViewerWindow.Actions.cs
@@ -267,6 +267,8 @@ namespace QuickLook
             Hide();
             //Dispatcher.BeginInvoke(new Action(Hide), DispatcherPriority.ApplicationIdle);
 
+            ViewWindowManager.GetInstance().ForgetCurrentWindow();
+
             ProcessHelper.PerformAggressiveGC();
         }
 
diff --git a/QuickLook/ViewerWindow.xaml b/QuickLook/ViewerWindow.xaml
index e88db94..fc25bdb 100644
--- a/QuickLook/ViewerWindow.xaml
+++ b/QuickLook/ViewerWindow.xaml
@@ -12,7 +12,7 @@
     d:DesignWidth="624" d:DesignHeight="700"
     MinWidth="400" MinHeight="200"
     WindowStartupLocation="CenterScreen"
-    Focusable="False" WindowStyle="None"
+    Focusable="False" 
     Background="{DynamicResource CaptionBackground}"
     ShowActivated="False" ShowInTaskbar="False">
     <controls:MainWindowBase.Resources>