diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
index bec348551..e2cc713c1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
@@ -943,13 +943,27 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
         val dateTakens = mLastMediaFetcher!!.getDateTakens()
 
         if (config.showRecycleBinAtFolders && !config.showRecycleBinLast && !dirs.map { it.path }.contains(RECYCLE_BIN)) {
-            val recycleBin = Directory().apply {
-                path = RECYCLE_BIN
-                name = getString(R.string.recycle_bin)
-                location = LOCATION_INTERNAL
-            }
+            if (mediaDB.getDeletedMediaCount() > 0) {
+                val recycleBin = Directory().apply {
+                    path = RECYCLE_BIN
+                    name = getString(R.string.recycle_bin)
+                    location = LOCATION_INTERNAL
+                }
 
-            dirs.add(0, recycleBin)
+                dirs.add(0, recycleBin)
+            }
+        }
+
+        if (dirs.map { it.path }.contains(FAVORITES)) {
+            if (mediaDB.getFavoritesCount() > 0) {
+                val favorites = Directory().apply {
+                    path = FAVORITES
+                    name = getString(R.string.favorites)
+                    location = LOCATION_INTERNAL
+                }
+
+                dirs.add(0, favorites)
+            }
         }
 
         try {
@@ -1042,6 +1056,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
         }
 
         val foldersToScan = mLastMediaFetcher!!.getFoldersToScan()
+        foldersToScan.remove(FAVORITES)
         foldersToScan.add(0, FAVORITES)
         if (config.showRecycleBinAtFolders) {
             if (foldersToScan.contains(RECYCLE_BIN)) {
@@ -1054,7 +1069,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
             foldersToScan.remove(RECYCLE_BIN)
         }
 
-        dirs.filterNot { it.path == RECYCLE_BIN }.forEach {
+        dirs.filterNot { it.path == RECYCLE_BIN || it.path == FAVORITES }.forEach {
             foldersToScan.remove(it.path)
         }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt
index 999ca60ca..8d0e05d6f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt
@@ -15,9 +15,15 @@ interface MediumDao {
     @Query("SELECT filename, full_path, parent_path, last_modified, date_taken, size, type, video_duration, is_favorite, deleted_ts FROM media WHERE deleted_ts = 0 AND is_favorite = 1")
     fun getFavorites(): List<Medium>
 
+    @Query("SELECT COUNT(filename) FROM media WHERE deleted_ts = 0 AND is_favorite = 1")
+    fun getFavoritesCount(): Long
+
     @Query("SELECT filename, full_path, parent_path, last_modified, date_taken, size, type, video_duration, is_favorite, deleted_ts FROM media WHERE deleted_ts != 0")
     fun getDeletedMedia(): List<Medium>
 
+    @Query("SELECT COUNT(filename) FROM media WHERE deleted_ts != 0")
+    fun getDeletedMediaCount(): Long
+
     @Insert(onConflict = REPLACE)
     fun insert(medium: Medium)