diff --git a/macosx/Controller.m b/macosx/Controller.m
index 8c5e627c9..553c76a1f 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -661,7 +661,18 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     
     //remember window states and close all windows
     [fDefaults setBool: [[fInfoController window] isVisible] forKey: @"InfoVisible"];
-    [[NSApp windows] makeObjectsPerformSelector: @selector(close)];
+    
+    const BOOL quickLookOpen = [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanel sharedPreviewPanelExists]
+                                && [[QLPreviewPanel sharedPreviewPanel] isVisible];
+    for (NSWindow * window in [NSApp windows])
+    {
+        if (!quickLookOpen || window != [QLPreviewPanel sharedPreviewPanel]) //hide quicklook window last to avoid animation
+            [window orderOut: nil];
+    }
+    
+    [[QLPreviewPanel sharedPreviewPanel] updateController];
+    [[QLPreviewPanel sharedPreviewPanel] orderOut: nil];
+    
     [self showStatusBar: NO animate: NO];
     [self showFilterBar: NO animate: NO];
     
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index ef8d5ed0e..9138085a9 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -501,7 +501,7 @@
     if (firstChar == 'f' && [event modifierFlags] & NSAlternateKeyMask && [event modifierFlags] & NSCommandKeyMask)
         [fController focusFilterField];
     else if (firstChar == ' ')
-        [fController toggleQuickLook: self];
+        [fController toggleQuickLook: nil];
     else
         [super keyDown: event];
 }