diff --git a/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m b/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m
index 7d4a6a54c..ce4224f7f 100644
--- a/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m
+++ b/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m
@@ -181,13 +181,13 @@ - (void)willHideMainWindow:(id)sender {
 		[[NSNotificationCenter defaultCenter] postNotificationName:@"InterfaceDeactivated" object:self];
 		[[self window] makeFirstResponder:nil];
 	}
-}
-
-- (void)hideMainWindowWithEffect:(id)effect {
     // Close the Quicklook panel if the QS window closes
     if([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) {
         [(QSSearchObjectView *)[[QLPreviewPanel sharedPreviewPanel] delegate] closePreviewPanel];
     }
+}
+
+- (void)hideMainWindowWithEffect:(id)effect {
 	[self willHideMainWindow:nil];
 	[self setHiding:YES];
 	if (effect && [[NSUserDefaults standardUserDefaults] boolForKey:kUseEffects])
@@ -465,6 +465,10 @@ - (BOOL)windowShouldClose:(id)sender {
 - (void)windowDidResignMain:(NSNotification *)aNotification {}
 
 - (void)windowDidResignKey:(NSNotification *)aNotification {
+    // Close the Quicklook panel if the QS window closes
+    if([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) {
+        return;
+    }
 	if ([aNotification object] == [self window]) {
 		if (hidingWindow) return;
 		if ([hideTimer isValid]) {