diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
index a7b0b624..49408a22 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
@@ -393,7 +393,9 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
                                 val sourceFolder = sourceFile.toFileDirItem(activity)
                                 activity.deleteFile(sourceFolder, true) {
                                     listener?.refreshItems()
-                                    finishActMode()
+                                    activity.runOnUiThread {
+                                        finishActMode()
+                                    }
                                 }
                             }
                         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
index 615f4860..5dafd21f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
@@ -230,20 +230,19 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
     private fun getRegularItemsOf(path: String, callback: (originalPath: String, items: ArrayList<ListItem>) -> Unit) {
         val items = ArrayList<ListItem>()
         val files = File(path).listFiles()?.filterNotNull()
-        if (context == null) {
+        if (context == null || files == null) {
             callback(path, items)
             return
         }
 
-        val lastModifieds = context!!.getFolderLastModifieds(path)
         val isSortingBySize = context!!.config.getFolderSorting(currentPath) and SORT_BY_SIZE != 0
         val getProperChildCount = context!!.config.getFolderViewType(currentPath) == VIEW_TYPE_LIST
-        if (files != null) {
-            for (file in files) {
-                val fileDirItem = getFileDirItemFromFile(file, isSortingBySize, lastModifieds, getProperChildCount)
-                if (fileDirItem != null) {
-                    items.add(fileDirItem)
-                }
+        val lastModifieds = context!!.getFolderLastModifieds(path)
+
+        for (file in files) {
+            val fileDirItem = getFileDirItemFromFile(file, isSortingBySize, lastModifieds, getProperChildCount)
+            if (fileDirItem != null) {
+                items.add(fileDirItem)
             }
         }