diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 070c08f4f6..e3274f5f2c 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1865,6 +1865,8 @@ static int database_callback(int btn, struct gui_synclist *lists)
              stat->ramcache ? "Yes" : "No");
     simplelist_addline("RAM: %d/%d B",
              stat->ramcache_used, stat->ramcache_allocated);
+    simplelist_addline("Total entries: %d",
+                       stat->total_entries);
     simplelist_addline("Progress: %d%% (%d entries)",
              stat->progress, stat->processed_entries);
     simplelist_addline("Curfile: %s",
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 69a6eaade5..09dbc2b041 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -5084,6 +5084,7 @@ static int get_progress(void)
 
 struct tagcache_stat* tagcache_get_stat(void)
 {
+    tc_stat.total_entries = current_tcmh.tch.entry_count;
     tc_stat.progress = get_progress();
     tc_stat.processed_entries = processed_dir_count;
 
diff --git a/apps/tagcache.h b/apps/tagcache.h
index b3baba0f30..37298c7a69 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -85,6 +85,7 @@ struct tagcache_stat {
     int  ramcache_used;      /* How much ram has been really used */
     int  progress;           /* Current progress of disk scan */
     int  processed_entries;  /* Scanned disk entries so far */
+    int  total_entries;      /* Total entries in tagcache */
     int  queue_length;       /* Command queue length */
     volatile const char 
         *curentry;           /* Path of the current entry being scanned. */