diff --git a/app/src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.kt b/app/src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.kt
index c97cca05717c..18dc8a2b477a 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.kt
@@ -169,8 +169,13 @@ class RichDocumentsEditorWebView : EditorWebView() {
                 val url = downloadJson.getString(URL).toUri()
                 when (downloadJson.getString(TYPE)) {
                     PRINT -> printFile(url)
+
                     SLIDESHOW -> showSlideShow(url)
-                    else -> downloadFile(url, fileName)
+
+                    else -> {
+                        val downloadFileName = downloadJson.optString(FILENAME, fileName)
+                        downloadFile(url, downloadFileName)
+                    }
                 }
             } catch (e: JSONException) {
                 Log_OC.e(this, "Failed to parse download json message: $e")
@@ -219,5 +224,6 @@ class RichDocumentsEditorWebView : EditorWebView() {
         private const val PRINT = "print"
         private const val SLIDESHOW = "slideshow"
         private const val NEW_NAME = "NewName"
+        private const val FILENAME = "filename"
     }
 }