diff --git a/QuickLook/MainWindowTransparent.xaml.cs b/QuickLook/MainWindowTransparent.xaml.cs
index 1cdb049..734ccd7 100644
--- a/QuickLook/MainWindowTransparent.xaml.cs
+++ b/QuickLook/MainWindowTransparent.xaml.cs
@@ -35,16 +35,11 @@ namespace QuickLook
                     BlurWindow.EnableWindowBlur(this);
             };
 
-            buttonCloseWindow.MouseLeftButtonUp += (sender, e) => BeginHide();
-
-            /*PreviewKeyUp += (sender, e) =>
-            {
-                if (e.Key == Key.Enter)
-                    OpenWithAssocApp();
-            };*/
+            buttonCloseWindow.MouseLeftButtonUp += (sender, e) => ViewWindowManager.GetInstance()
+                .InvokeRoutine(new KeyEventArgs(Keys.Escape));
 
             buttonOpenWith.Click += (sender, e) => ViewWindowManager.GetInstance()
-                .InvokeRoutine(new KeyEventArgs(Keys.Escape));
+                .InvokeRoutine(new KeyEventArgs(Keys.Enter));
         }
 
         public ContextObject ContextObject { get; private set; }