diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index d0fd12e33..5721e912b 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -558,6 +558,7 @@
 - (void)setCurrentEntry:(PlaylistEntry *)pe
 {
 	currentEntry.current = NO;
+	currentEntry.stopAfter = NO;
 	
 	pe.current = YES;
 	
@@ -697,7 +698,7 @@
 	if (action == @selector(emptyQueueList:) && ([queueList count] < 1))
 		return NO;
 	
-	if (action == @selector(stopAfterCurrent:) && !currentEntry.stopAfter)
+	if (action == @selector(stopAfterCurrent:) && currentEntry.stopAfter)
 		return NO;
 	
 	// if nothing is selected, gray out these
diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m
index 1813be346..d46acccad 100644
--- a/Playlist/PlaylistEntry.m
+++ b/Playlist/PlaylistEntry.m
@@ -68,12 +68,12 @@
 
 + (NSSet *)keyPathsForValuesAffectingStatus
 {
-	return [NSSet setWithObjects:@"current",@"queued", @"error", nil];
+	return [NSSet setWithObjects:@"current",@"queued", @"error", @"stopAfter", nil];
 }
 
 + (NSSet *)keyPathsForValuesAffectingStatusMessage
 {
-	return [NSSet setWithObjects:@"current", @"queued", @"queuePosition", @"error", @"errorMessage", nil];
+	return [NSSet setWithObjects:@"current", @"queued", @"queuePosition", @"error", @"errorMessage", @"stopAfter", nil];
 }
 
 - (void)setProperties:(NSDictionary *)properties