diff --git a/NEWS b/NEWS
index d87d6df6..b89d5aab 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ncmpcpp-0.6.1 (????-??-??)
 * Only ID3v2.4 tags are now saved to mp3 files.
 * Mouse scrolling with newer ncurses API now works properly.
 * Adding songs from an album in media library now works properly with fetch delay.
+* Adding songs from a playlist in playlist editor now works properly with fetch delay.
 
 ncmpcpp-0.6 (2014-10-25)
 
diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp
index dcc118f0..cf3689bb 100644
--- a/src/playlist_editor.cpp
+++ b/src/playlist_editor.cpp
@@ -239,14 +239,11 @@ ProxySongList PlaylistEditor::contentProxyList()
 
 void PlaylistEditor::AddToPlaylist(bool add_n_play)
 {
-	MPD::SongList list;
-	
 	if (isActiveWindow(Playlists) && !Playlists.empty())
 	{
-		bool success;
-		withUnfilteredMenu(Content, [&]() {
-			success = addSongsToPlaylist(Content.beginV(), Content.endV(), add_n_play, -1);
-		});
+		MPD::SongList list;
+		Mpd.GetPlaylistContent(Playlists.current().value(), vectorMoveInserter(list));
+		bool success = addSongsToPlaylist(list.begin(), list.end(), add_n_play, -1);
 		Statusbar::printf("Playlist \"%1%\" loaded%2%",
 			Playlists.current().value(), withErrors(success)
 		);
@@ -488,12 +485,8 @@ MPD::SongList PlaylistEditor::getSelectedSongs()
 			}
 		}
 		// if no item is selected, add songs from right column
-		if (!any_selected && !Content.empty())
-		{
-			withUnfilteredMenu(Content, [this, &result]() {
-				result.insert(result.end(), Content.beginV(), Content.endV());
-			});
-		}
+		if (!any_selected && !Playlists.empty())
+			Mpd.GetPlaylistContent(Playlists.current().value(), vectorMoveInserter(result));
 	}
 	else if (isActiveWindow(Content))
 	{