diff --git a/NEWS b/NEWS
index eaaa24b9f..4a4c4405f 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ver 0.15.11 (2010/??/??)
 * decoders:
   - mp4ff: support tags "albumartist", "band"
   - mikmod: fix memory leak
+* playlist: emit IDLE_OPTIONS when resetting single mode
 
 
 ver 0.15.10 (2010/05/30)
diff --git a/src/playlist_control.c b/src/playlist_control.c
index 4359611fd..4c156f0f5 100644
--- a/src/playlist_control.c
+++ b/src/playlist_control.c
@@ -24,6 +24,7 @@
 
 #include "playlist_internal.h"
 #include "player_control.h"
+#include "idle.h"
 
 #include <glib.h>
 
@@ -156,6 +157,8 @@ nextSongInPlaylist(struct playlist *playlist)
 	if (next_order < 0) {
 		/* cancel single */
 		playlist->queue.single = false;
+		idle_add(IDLE_OPTIONS);
+
 		/* no song after this one: stop playback */
 		stopPlaylist(playlist);