diff --git a/NEWS b/NEWS
index ad5466d8c..192cbeaea 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ NEWS file for Transmission <http://www.transmissionbt.com/>
 1.30 (2008/mm/dd)
 http://trac.transmissionbt.com/query?group=component&milestone=1.30
 - Mac
-   + QuickLook integration in the main window and inspector's file tab
+   + Quick Look integration in the main window and inspector's file tab
    + Transfers can be dragged to different groups
    + Status strings are toggled from the action button (they are no longer clickable)
 
diff --git a/macosx/QuickLookController.m b/macosx/QuickLookController.m
index 8cc73a02c..58645b391 100644
--- a/macosx/QuickLookController.m
+++ b/macosx/QuickLookController.m
@@ -92,10 +92,12 @@ QuickLookController * fQuickLookInstance = nil;
     {
         if ([self quickLookSelectItems])
         {
+            NSWindow * keyWindow = [NSApp keyWindow];
+            
             [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFrontWithEffect: 2];
-            // Restore the focus to our window to demo the selection changing, scrolling (left/right)
-            // and closing (space) functionality
-            //[[self window] makeKeyWindow];
+            
+            //restore the focus to previous key window
+            [keyWindow makeKeyWindow];
         }
     }
 }