diff --git a/app/build.gradle b/app/build.gradle
index d6eba255f..913b4ca95 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.15.15'
+    implementation 'com.simplemobiletools:commons:5.15.21'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
index b66f91b6d..691e2b73f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
@@ -240,15 +240,23 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
             } else {
                 activity.handleLockedFolderOpening(path) { success ->
                     if (success) {
-                        activity.removeNoMedia(path) {
-                            if (activity.config.shouldShowHidden) {
-                                updateFolderNames()
-                            } else {
-                                activity.runOnUiThread {
-                                    listener?.refreshItems()
-                                    finishActMode()
+                        if (path.containsNoMedia()) {
+                            activity.removeNoMedia(path) {
+                                if (activity.config.shouldShowHidden) {
+                                    updateFolderNames()
+                                } else {
+                                    activity.runOnUiThread {
+                                        listener?.refreshItems()
+                                        finishActMode()
+                                    }
                                 }
                             }
+                        } else {
+                            config.addIncludedFolder(path)
+                            activity.runOnUiThread {
+                                listener?.refreshItems()
+                                finishActMode()
+                            }
                         }
                     }
                 }