diff --git a/Spotlight/SpotlightPlaylistController.m b/Spotlight/SpotlightPlaylistController.m
index 537bcde9f..82171bfa2 100644
--- a/Spotlight/SpotlightPlaylistController.m
+++ b/Spotlight/SpotlightPlaylistController.m
@@ -45,12 +45,13 @@
     return NSDragOperationNone;
 }
 
+// Don't update until something has been found
 - (NSArray *)arrangeObjects:(NSArray *)objects
 {
-    if(![spotlightWindowController.query isGathering])
-        self.oldObjects = [super arrangeObjects:objects];
+    if((![spotlightWindowController.query isGathering]) || ([objects count] > 0))
+		self.oldObjects = [super arrangeObjects:objects];
 
-    return oldObjects;
+    return self.oldObjects;
 }
 
 - (void)dealloc