diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index fc2a3ed66..20f529ee5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -681,8 +681,12 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
             gotDirectories(directories, true)
         } else {
             mDirs = directories
-            storeDirectories()
         }
+
+        Thread {
+            storeDirectoryItems(directories)
+            removeInvalidDirectories()
+        }.start()
     }
 
     private fun checkWhatsNewDialog() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index f290cdc87..96cddb557 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -155,7 +155,8 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
     }
 
     private fun renameDir() {
-        val sourcePath = dirs[selectedPositions.first()].path
+        val firstDir = dirs[selectedPositions.first()]
+        val sourcePath = firstDir.path
         val dir = File(sourcePath)
         if (activity.isAStorageRootFolder(dir.absolutePath)) {
             activity.toast(R.string.rename_folder_root)
@@ -164,11 +165,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
 
         RenameItemDialog(activity, dir.absolutePath) {
             activity.runOnUiThread {
-                if (selectedPositions.isEmpty()) {
-                    return@runOnUiThread
-                }
-
-                dirs[selectedPositions.first()].apply {
+                firstDir.apply {
                     path = it
                     name = it.getFilenameFromPath()
                     tmb = File(it, tmb.getFilenameFromPath()).absolutePath
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
index 66fab4107..74718a1f7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Context.kt
@@ -23,6 +23,7 @@ import com.simplemobiletools.gallery.asynctasks.GetDirectoriesAsynctask
 import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask
 import com.simplemobiletools.gallery.databases.GalleryDataBase
 import com.simplemobiletools.gallery.helpers.*
+import com.simplemobiletools.gallery.interfaces.DirectoryDao
 import com.simplemobiletools.gallery.models.Directory
 import com.simplemobiletools.gallery.models.Medium
 import com.simplemobiletools.gallery.views.MySquareImageView
@@ -249,10 +250,7 @@ fun Context.getCachedDirectories(callback: (ArrayList<Directory>) -> Unit) {
         val directoryDao = galleryDB.DirectoryDao()
         val directories = directoryDao.getAll() as ArrayList<Directory>
         callback(directories)
-
-        directories.filter { !File(it.path).exists() }.forEach {
-            directoryDao.deleteDirPath(it.path)
-        }
+        removeInvalidDirectories(directories, directoryDao)
     }.start()
 }
 
@@ -268,6 +266,13 @@ fun Context.getCachedMedia(path: String, callback: (ArrayList<Medium>) -> Unit)
     }.start()
 }
 
+fun Context.removeInvalidDirectories(dirs: ArrayList<Directory>? = null, directoryDao: DirectoryDao = galleryDB.DirectoryDao()) {
+    val dirsToCheck = dirs ?: directoryDao.getAll()
+    dirsToCheck.filter { !File(it.path).exists() }.forEach {
+        directoryDao.deleteDirPath(it.path)
+    }
+}
+
 fun Context.updateMediaPath(oldPath: String, newPath: String) {
     val newFilename = newPath.getFilenameFromPath()
     val newParentPath = newPath.getParentPath()