diff --git a/src/qml/FileDelegateContextMenu.qml b/src/qml/FileDelegateContextMenu.qml
index 7cf858dad..52a462f9a 100644
--- a/src/qml/FileDelegateContextMenu.qml
+++ b/src/qml/FileDelegateContextMenu.qml
@@ -54,8 +54,8 @@ DelegateContextMenu {
             icon.name: "document-save"
             onTriggered: {
                 var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);
+                dialog.selectedFile = currentRoom.fileNameToDownload(eventId);
                 dialog.open();
-                dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(eventId);
             }
         },
         DelegateContextMenu.ReplyMessageAction {},
diff --git a/src/qml/NeochatMaximizeComponent.qml b/src/qml/NeochatMaximizeComponent.qml
index a9dde97d9..5e2cba71b 100644
--- a/src/qml/NeochatMaximizeComponent.qml
+++ b/src/qml/NeochatMaximizeComponent.qml
@@ -110,8 +110,8 @@ Components.AlbumMaximizeComponent {
 
     onSaveItem: {
         var dialog = saveAsDialog.createObject(QQC2.Overlay.overlay);
+        dialog.selectedFile = currentRoom.fileNameToDownload(root.currentEventId);
         dialog.open();
-        dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(root.currentEventId);
     }
 
     Connections {
diff --git a/src/timeline/FileComponent.qml b/src/timeline/FileComponent.qml
index 034373828..70ea5f48f 100644
--- a/src/timeline/FileComponent.qml
+++ b/src/timeline/FileComponent.qml
@@ -72,8 +72,8 @@ ColumnLayout {
 
     function saveFileAs() {
         const dialog = fileDialog.createObject(QQC2.Overlay.overlay);
+        dialog.selectedFile = root.room.fileNameToDownload(root.eventId);
         dialog.open();
-        dialog.currentFile = dialog.folder + "/" + root.room.fileNameToDownload(root.eventId);
     }
 
     function openSavedFile() {