diff --git a/apps/playlist.c b/apps/playlist.c
index fba9b6f4bb..133820ebc4 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -2776,7 +2776,10 @@ int playlist_set_current(struct playlist_info* playlist)
 
     return 0;
 }
-
+struct playlist_info *playlist_get_current(void)
+{
+    return &current_playlist;
+}
 /*
  * Close files and delete control file for non-current playlist.
  */
diff --git a/apps/playlist.h b/apps/playlist.h
index fa234f6c12..638e3949b4 100644
--- a/apps/playlist.h
+++ b/apps/playlist.h
@@ -135,6 +135,7 @@ int playlist_update_resume_info(const struct mp3entry* id3);
 int playlist_get_display_index(void);
 int playlist_amount(void);
 void playlist_set_last_shuffled_start(void);
+struct playlist_info *playlist_get_current(void);
 
 /* Exported functions for all playlists.  Pass NULL for playlist_info
    structure to work with current playlist. */
diff --git a/apps/tagtree.c b/apps/tagtree.c
index 4b67b73ca6..ef9c9d2de7 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -1507,7 +1507,6 @@ int tagtree_enter(struct tree_context* c)
                  allow user to cancel the operation */
                 if (!warn_on_pl_erase())
                     break;
-
                 if (tagtree_play_folder(c) >= 0)
                     rc = 2;
                 break;
@@ -1729,7 +1728,7 @@ static int tagtree_play_folder(struct tree_context* c)
     gui_synclist_select_item(&tree_lists, c->selected_item);
 
     playlist_start(c->selected_item,0);
-
+    playlist_get_current()->num_inserted_tracks = 0; /* make warn on playlist erase work */
     return 0;
 }