diff --git a/app/src/main/java/com/lassi/app/MainActivity.kt b/app/src/main/java/com/lassi/app/MainActivity.kt
index 89062ae..4d298cf 100644
--- a/app/src/main/java/com/lassi/app/MainActivity.kt
+++ b/app/src/main/java/com/lassi/app/MainActivity.kt
@@ -121,7 +121,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
             }
 
             R.id.btnAudioPicker -> {
-                val intent = lassi.setMediaType(MediaType.AUDIO).setMaxCount(4).setGridSize(2)
+                val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMediaType(MediaType.AUDIO).setMaxCount(4).setGridSize(2)
                     .setPlaceHolder(R.drawable.ic_audio_placeholder)
                     .setErrorDrawable(R.drawable.ic_audio_placeholder)
                     .setSelectionDrawable(R.drawable.ic_checked_media)
@@ -252,7 +252,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
     }
 
     private fun launchDocPicker() {
-        val intent = lassi.setMediaType(MediaType.DOC).setMaxCount(4).setGridSize(2)
+        val intent = lassi.with(LassiOption.CAMERA_AND_GALLERY).setMediaType(MediaType.DOC).setMaxCount(4).setGridSize(2)
             .setPlaceHolder(R.drawable.ic_document_placeholder)
             .setErrorDrawable(R.drawable.ic_document_placeholder)
             .setSelectionDrawable(R.drawable.ic_checked_media)
diff --git a/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt b/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
index 18de595..5d8e3f9 100644
--- a/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
+++ b/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
@@ -118,7 +118,6 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
                 ToastUtils.showToast(
                     requireContext(), LassiConfig.getConfig().customLimitExceedingErrorMessage
                 )
-                activity?.finish()
             } else {
                 if (uris.isNotEmpty()) {
                     val mediaPaths = ArrayList(uris.mapNotNull { uri ->
@@ -130,6 +129,7 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel, FragmentMedia
                     Log.d("PhotoPicker", "!@# PHOTO-PICKER:: No media selected")
                 }
             }
+            activity?.finish()  // To finish host activity when user closes photo picker dialog
         }
 
     private fun setResultOk(selectedMedia: ArrayList<MiMedia>?) {