diff --git a/app/build.gradle b/app/build.gradle
index 26a5b7b9..0b2281f8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,7 +46,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.0.6'
+    implementation 'com.simplemobiletools:commons:3.0.9'
 
     implementation files('../libs/RootTools.jar')
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
index 28ef8f0e..1ac664d4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ItemsAdapter.kt
@@ -41,7 +41,6 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
     lateinit private var fileDrawable: Drawable
 
     init {
-        selectableItemCount = fileDirItems.count()
         initDrawables()
     }
 
@@ -82,6 +81,8 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
         }
     }
 
+    override fun getSelectableItemCount() = fileDirItems.size
+
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int) = createViewHolder(R.layout.list_item, parent)
 
     override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
@@ -372,7 +373,6 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
 
     fun updateItems(newItems: MutableList<FileDirItem>) {
         fileDirItems = newItems
-        selectableItemCount = fileDirItems.size
         notifyDataSetChanged()
         finishActMode()
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt
index 2522f60c..211b6a0b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/adapters/ManageFavoritesAdapter.kt
@@ -17,10 +17,6 @@ class ManageFavoritesAdapter(activity: BaseSimpleActivity, var favorites: ArrayL
 
     private val config = activity.config
 
-    init {
-        selectableItemCount = favorites.size
-    }
-
     override fun getActionMenuId() = R.menu.cab_delete_only
 
     override fun prepareActionMode(menu: Menu) {}
@@ -37,6 +33,8 @@ class ManageFavoritesAdapter(activity: BaseSimpleActivity, var favorites: ArrayL
         }
     }
 
+    override fun getSelectableItemCount() = favorites.size
+
     override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int) = createViewHolder(R.layout.item_manage_favorite, parent)
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {