diff --git a/apps/playlist.c b/apps/playlist.c
index 92a7ad979b..0d9df36e32 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -293,6 +293,14 @@ void add_indices_to_playlist(void)
                 if ( playlist.amount >= MAX_PLAYLIST_SIZE ) {
                     if(!playlist.in_ram)
                         close(fd);
+
+                    lcd_clear_display();
+                    lcd_puts(0,0,"10000 file");
+                    lcd_puts(0,1,"limit reached");
+                    lcd_update();
+                    sleep(HZ*2);
+                    lcd_clear_display();
+
                     return;
                 }
 
diff --git a/apps/tree.c b/apps/tree.c
index 531f7838aa..8d16806304 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -221,6 +221,18 @@ static int showdir(char *path, int start)
         strncpy(lastdir,path,sizeof(lastdir));
         lastdir[sizeof(lastdir)-1] = 0;
         qsort(dircacheptr,filesindir,sizeof(struct entry*),compare);
+
+        if ( filesindir == MAX_FILES_IN_DIR ) {
+#ifdef HAVE_NEW_CHARCELL_LCD
+            lcd_double_height(false);
+#endif
+            lcd_clear_display();
+            lcd_puts(0,0,"200 file");
+            lcd_puts(0,1,"limit reached");
+            lcd_update();
+            sleep(HZ*2);
+            lcd_clear_display();
+        }
     }
 
     lcd_stop_scroll();