diff --git a/apps/filetree.c b/apps/filetree.c
index 107163add5..2d4416df5a 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -72,6 +72,7 @@ static int strnatcasecmp_n(const char *a, const char *b, size_t n)
 int ft_build_playlist(struct tree_context* c, int start_index)
 {
     int i;
+    int res = 0;
     int start=start_index;
 
     tree_lock_cache(c);
@@ -81,7 +82,8 @@ int ft_build_playlist(struct tree_context* c, int start_index)
     {
         if((entries[i].attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO)
         {
-            if (playlist_add(entries[i].name) < 0)
+            res = playlist_add(entries[i].name);
+            if (res < 0)
                 break;
         }
         else
@@ -92,7 +94,22 @@ int ft_build_playlist(struct tree_context* c, int start_index)
         }
     }
 
-    tree_unlock_cache(c);
+    if (res == -2) /* name buffer is full store to disk? */
+    {
+        if (yesno_pop(ID2P(LANG_CATALOG_ADD_TO_NEW)))
+        {
+            char playlist_dir[MAX_PATH];
+            strmemccpy(playlist_dir, c->currdir, sizeof(playlist_dir));
+            tree_unlock_cache(c);
+            if (playlist_create(playlist_dir, "dynamic.m3u8") >= 0)
+            {
+                playlist_insert_directory(NULL, playlist_dir,
+                                          PLAYLIST_REPLACE, false, false);
+            }
+        }
+    }
+    else
+        tree_unlock_cache(c);
 
     return start_index;
 }
diff --git a/apps/playlist.c b/apps/playlist.c
index b349799269..4e4e3ed42a 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -2082,8 +2082,13 @@ int playlist_add(const char *filename)
     struct playlist_info* playlist = &current_playlist;
     int len = strlen(filename);
 
-    if((len+1 > playlist->buffer_size - playlist->buffer_end_pos) ||
-       (playlist->amount >= playlist->max_playlist_size))
+    if(len+1 > playlist->buffer_size - playlist->buffer_end_pos)
+    {
+        notify_buffer_full();
+        return -2;
+    }
+
+    if(playlist->amount >= playlist->max_playlist_size)
     {
         notify_buffer_full();
         return -1;