diff --git a/AppController.h b/AppController.h
index aa1d08e94..50a01b6c8 100644
--- a/AppController.h
+++ b/AppController.h
@@ -20,8 +20,6 @@
 	IBOutlet NSButton *playButton;
 	IBOutlet NSButton *prevButton;
 	IBOutlet NSButton *nextButton;
-	IBOutlet NSButton *addButton;
-	IBOutlet NSButton *remButton;
 	IBOutlet NSButton *infoButton;
 	IBOutlet NSButton *fileButton;
 	IBOutlet NSButton *shuffleButton;
diff --git a/AppController.m b/AppController.m
index b2722ed23..0162bbc53 100644
--- a/AppController.m
+++ b/AppController.m
@@ -93,8 +93,6 @@
 	[playButton setToolTip:NSLocalizedString(@"PlayButtonTooltip", @"")];
 	[prevButton setToolTip:NSLocalizedString(@"PrevButtonTooltip", @"")];
 	[nextButton setToolTip:NSLocalizedString(@"NextButtonTooltip", @"")];
-	[addButton setToolTip:NSLocalizedString(@"AddButtonTooltip", @"")];
-	[remButton setToolTip:NSLocalizedString(@"RemoveButtonTooltip", @"")];
 	[infoButton setToolTip:NSLocalizedString(@"InfoButtonTooltip", @"")];
 	[shuffleButton setToolTip:NSLocalizedString(@"ShuffleButtonTooltip", @"")];
 	[repeatButton setToolTip:NSLocalizedString(@"RepeatButtonTooltip", @"")];
@@ -209,7 +207,7 @@
 - (IBAction)toggleFileDrawer:(id)sender
 {
 	[mainWindow makeKeyAndOrderFront:self];
-	NSLog(@"TOGGLING...");
+
 	[fileDrawer toggle:self];
 }
 
@@ -231,6 +229,7 @@
 		[infoButton setState:NSOffState];
 	}
 	else if ([notification object] == fileDrawer) {
+		NSLog(@"CLOSED");
 		[fileButton setState:NSOffState];
 		
 		[mainWindow makeFirstResponder: playlistView];
diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index 1e4ca0c2d..b028f1127 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -32,11 +32,11 @@
 	<integer>4</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>463</integer>
-		<integer>513</integer>
-		<integer>29</integer>
 		<integer>21</integer>
 		<integer>1156</integer>
+		<integer>29</integer>
+		<integer>463</integer>
+		<integer>513</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8L127</string>
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 2b39a1410..6bb5ff5c8 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/FileDrawer/FileOutlineView.m b/FileDrawer/FileOutlineView.m
index 43c005070..0f6a26753 100644
--- a/FileDrawer/FileOutlineView.m
+++ b/FileDrawer/FileOutlineView.m
@@ -61,6 +61,8 @@
 			//Add songs to list
 			[[self delegate] addSelectedToPlaylist];
 			
+			[fileDrawer close];
+		} else if (pressedChar == 0x1b) {//Escape
 			[fileDrawer close];
 		} else if (pressedChar == NSLeftArrowFunctionKey ||  pressedChar == NSRightArrowFunctionKey) { //left or right
 			[super keyDown:theEvent];