diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt
index 68595ae46..13002eb86 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/asynctasks/GetMediaAsynctask.kt
@@ -2,7 +2,9 @@ package com.simplemobiletools.gallery.asynctasks
 
 import android.content.Context
 import android.os.AsyncTask
+import com.simplemobiletools.gallery.extensions.config
 import com.simplemobiletools.gallery.extensions.getFilesFrom
+import com.simplemobiletools.gallery.extensions.getMediaByDirectories
 import com.simplemobiletools.gallery.models.Medium
 import java.util.*
 
@@ -11,8 +13,19 @@ class GetMediaAsynctask(val context: Context, val mPath: String, val isPickVideo
         AsyncTask<Void, Void, ArrayList<Medium>>() {
 
     override fun doInBackground(vararg params: Void): ArrayList<Medium> {
-        val path = if (showAll) "" else mPath
-        return context.getFilesFrom(path, isPickImage, isPickVideo)
+        return if (showAll) {
+            val mediaMap = context.getMediaByDirectories(isPickVideo, isPickImage)
+            val media = ArrayList<Medium>()
+            for ((path, curMedia) in mediaMap) {
+                media.addAll(curMedia)
+            }
+
+            Medium.sorting = context.config.getFileSorting("")
+            media.sort()
+            media
+        } else {
+            context.getFilesFrom(mPath, isPickImage, isPickVideo)
+        }
     }
 
     override fun onPostExecute(media: ArrayList<Medium>) {