diff --git a/Application/AppController.m b/Application/AppController.m
index 9d218e726..7fc6ae684 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -244,7 +244,7 @@ increase/decrease as long as the user holds the left/right, plus/minus button */
 
 	[self registerHotKeys];
 	
-    [spotlightWindowController initWithWindowNibName:@"SpotlightPanel"];
+    [spotlightWindowController init];
 	
 	//Init Remote
 	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"remoteEnabled"] && ![[NSUserDefaults standardUserDefaults] boolForKey:@"remoteOnlyOnActive"]) {
diff --git a/Spotlight/SpotlightWindowController.m b/Spotlight/SpotlightWindowController.m
index 7976c6ae5..f4c604e10 100644
--- a/Spotlight/SpotlightWindowController.m
+++ b/Spotlight/SpotlightWindowController.m
@@ -38,7 +38,7 @@ static NSPredicate * musicOnlyPredicate = nil;
 
 - (id)init
 {
-	if (self = [super init]) {
+	if (self = [super initWithWindowNibName:@"SpotlightPanel"]) {
 		self.query = [[NSMetadataQuery alloc] init];
         [self.query setDelegate:self];
 	}