diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 535b9b29c..01e6cebdf 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -2136,6 +2136,12 @@ Gw
                         </binding>
                     </connections>
                 </menuItem>
+                <menuItem title="Stop after Selection" id="omb-wi-loX">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <connections>
+                        <action selector="stopAfterSelection:" target="218" id="ZRy-Mw-4cY"/>
+                    </connections>
+                </menuItem>
                 <menuItem isSeparatorItem="YES" id="2047"/>
                 <menuItem title="Search for Artist" id="2045">
                     <modifierMask key="keyEquivalentModifierMask"/>
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 581fd36c8..37d15d86e 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -1455,6 +1455,19 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
 	[self.tableView reloadDataForRowIndexes:refreshSet columnIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, columns)]];
 }
 
+- (IBAction)stopAfterSelection:(id)sender {
+	NSMutableIndexSet *refreshSet = [[NSMutableIndexSet alloc] init];
+
+	for(PlaylistEntry *pe in [self selectedObjects]) {
+		pe.stopAfter = !pe.stopAfter;
+		[refreshSet addIndex:pe.index];
+	}
+
+	// Refresh entire row of all affected items to update tooltips
+	unsigned long columns = [[self.tableView tableColumns] count];
+	[self.tableView reloadDataForRowIndexes:refreshSet columnIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, columns)]];
+}
+
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
 	SEL action = [menuItem action];