diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
index 6f6338795..74e8662cb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
@@ -188,6 +188,11 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
             } else if (saveUri.scheme == "content") {
                 var newPath = applicationContext.getRealPathFromURI(saveUri) ?: ""
                 var shouldAppendFilename = true
+                if (newPath.isEmpty()) {
+                    newPath = applicationContext.getFilenameFromContentUri(saveUri) ?: ""
+                    shouldAppendFilename = false
+                }
+
                 if (newPath.isEmpty()) {
                     newPath = "$internalStoragePath/${getCurrentFormattedDateTime()}.${saveUri.toString().getFilenameExtension()}"
                     shouldAppendFilename = false