diff --git a/Application/AppController.m b/Application/AppController.m
index 9b51bfe16..b8bcc763f 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -338,8 +338,6 @@ void* kAppControllerContext = &kAppControllerContext;
     if (currentStatus == CogStatusStopping)
         currentStatus = CogStatusStopped;
     
-    [[NSUserDefaults standardUserDefaults] setInteger:currentStatus forKey:@"lastPlaybackStatus"];
-    
     if (currentStatus != CogStatusStopped)
     {
         PlaylistEntry * pe = [playlistController currentEntry];
@@ -352,6 +350,8 @@ void* kAppControllerContext = &kAppControllerContext;
     
 	[playbackController stop:self];
 	
+    [[NSUserDefaults standardUserDefaults] setInteger:currentStatus forKey:@"lastPlaybackStatus"];
+    
 	NSFileManager *fileManager = [NSFileManager defaultManager];
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
     NSString *folder = [[paths firstObject] stringByAppendingPathComponent:@"Cog"];
diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 6d36c3245..846a7cc0f 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -1768,9 +1768,9 @@ Gw
         <customObject id="1303" userLabel="SUUpdater" customClass="SUUpdater"/>
         <customObject id="1319" userLabel="PlaylistLoader" customClass="PlaylistLoader">
             <connections>
+                <outlet property="playbackController" destination="705" id="EBV-A8-3bM"/>
                 <outlet property="playlistController" destination="218" id="1320"/>
                 <outlet property="playlistView" destination="206" id="6MS-vO-DQp"/>
-                <outlet property="playbackController" destination="705" id="EBV-A8-3bM"/>
             </connections>
         </customObject>
         <menu title="Menu" id="1324" userLabel="TableMenu">