diff --git a/app/src/main/java/sushi/hardcore/droidfs/adapters/ExplorerElementAdapter.kt b/app/src/main/java/sushi/hardcore/droidfs/adapters/ExplorerElementAdapter.kt
index 5a28216..e2c046a 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/adapters/ExplorerElementAdapter.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/adapters/ExplorerElementAdapter.kt
@@ -21,7 +21,7 @@ import java.util.*
 
 class ExplorerElementAdapter(private val context: Context) : BaseAdapter() {
     private val dateFormat: DateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault())
-    private lateinit var explorerElements: List<ExplorerElement>
+    private var explorerElements = listOf<ExplorerElement>()
     private val inflater: LayoutInflater = LayoutInflater.from(context)
     val selectedItems: MutableList<Int> = ArrayList()
     private val themeColor = ThemeColor.getThemeColor(context)
@@ -113,7 +113,7 @@ class ExplorerElementAdapter(private val context: Context) : BaseAdapter() {
     }
 
     fun setExplorerElements(explorer_elements: List<ExplorerElement>) {
-        unSelectAll()
         this.explorerElements = explorer_elements
+        unSelectAll()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt
index 139465a..c374ee2 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt
@@ -216,11 +216,6 @@ open class BaseExplorerActivity : BaseActivity() {
     protected fun setCurrentPath(path: String) {
         explorerElements = gocryptfsVolume.listDir(path)
         textDirEmpty.visibility = if (explorerElements.size == 0) View.VISIBLE else View.INVISIBLE
-        sortExplorerElements()
-        if (path.isNotEmpty()) { //not root
-            explorerElements.add(0, ExplorerElement("..", (-1).toShort(), -1, -1, currentDirectoryPath))
-        }
-        explorerAdapter.setExplorerElements(explorerElements)
         currentDirectoryPath = path
         currentPathText.text = getString(R.string.location, currentDirectoryPath)
         Thread{
@@ -241,7 +236,14 @@ open class BaseExplorerActivity : BaseActivity() {
             }
             runOnUiThread {
                 totalSizeText.text = getString(R.string.total_size, PathUtils.formatSize(totalSize))
-                explorerAdapter.notifyDataSetChanged()
+                sortExplorerElements()
+                if (path.isNotEmpty()) { //not root
+                    explorerElements.add(
+                        0,
+                        ExplorerElement("..", (-1).toShort(), -1, -1, currentDirectoryPath)
+                    )
+                }
+                explorerAdapter.setExplorerElements(explorerElements)
             }
         }.start()
     }