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 aa150ea..ff2b15f 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/adapters/ExplorerElementAdapter.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/adapters/ExplorerElementAdapter.kt
@@ -27,10 +27,6 @@ class ExplorerElementAdapter(
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     val dateFormat: DateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault())
     var explorerElements = listOf<ExplorerElement>()
-        set(value) {
-            field = value
-            unSelectAll()
-        }
     val selectedItems: MutableList<Int> = ArrayList()
 
     override fun getItemCount(): Int {
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 654617b..d0509d6 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt
@@ -223,6 +223,7 @@ open class BaseExplorerActivity : BaseActivity() {
             ExplorerElement.sortBy(sortOrderValues[currentSortOrderIndex], foldersFirst, explorerElements)
         }
         explorerAdapter.explorerElements = explorerElements
+        unselectAll()
         val sharedPrefsEditor = sharedPrefs.edit()
         sharedPrefsEditor.putString(ConstValues.sort_order_key, sortOrderValues[currentSortOrderIndex])
         sharedPrefsEditor.apply()
diff --git a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt
index e03dfd9..9a90398 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/ExplorerActivity.kt
@@ -343,7 +343,6 @@ class ExplorerActivity : BaseExplorerActivity() {
                             }
                         }
                         cancelItemAction()
-                        unselectAll()
                     }
                 } else if (currentItemAction == ItemsActions.MOVE){
                     mapFileForMove(itemsToProcess, itemsToProcess[0].explorerElement.parentPath)
@@ -365,7 +364,6 @@ class ExplorerActivity : BaseExplorerActivity() {
                             }
                         }
                         cancelItemAction()
-                        unselectAll()
                     }
                 }
                 true
@@ -459,7 +457,6 @@ class ExplorerActivity : BaseExplorerActivity() {
                 break
             }
         }
-        unselectAll()
         setCurrentPath(currentDirectoryPath) //refresh
     }
 }