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 302528a2e..ec4ef62e1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -193,7 +193,7 @@ class DirectoryAdapter(val activity: SimpleActivity, val dirs: MutableList<Direc
 
     private fun getSelectedPaths(): HashSet<String> {
         val positions = multiSelector.selectedPositions
-        val paths = HashSet<String>()
+        val paths = HashSet<String>(positions.size)
         positions.forEach { paths.add(dirs[it].path) }
         return paths
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index a3cd701d8..6dc93891d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -112,11 +112,9 @@ class MediaAdapter(val activity: SimpleActivity, var media: MutableList<Medium>,
     }
 
     private fun getSelectedMedia(): List<Medium> {
-        val selections = multiSelector.selectedPositions
-        val cnt = selections.size
-        val selectedMedia = (0..cnt - 1)
-                .map { media[selections[it]] }
-
+        val positions = multiSelector.selectedPositions
+        val selectedMedia = ArrayList<Medium>(positions.size)
+        positions.forEach { selectedMedia.add(media[it]) }
         return selectedMedia
     }