1 files changed, 15 insertions, 10 deletions
diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
index 2ef591a591..1c162be8fc 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
@@ -169,16 +169,18 @@ void QXdgDesktopPortalFileDialog::openPortal(Qt::WindowFlags windowFlags, Qt::Wi
     options.insert("multiple"_L1, d->multipleFiles);
     options.insert("directory"_L1, d->directoryMode);
 
-    if (d->saveFile) {
-        if (!d->directory.isEmpty())
-            options.insert("current_folder"_L1, QFile::encodeName(d->directory).append('\0'));
-
-        if (!d->selectedFiles.isEmpty()) {
-            // current_file for the file to be pre-selected, current_name for the file name to be pre-filled
-            // current_file accepts absolute path while current_name accepts just file name
-            options.insert("current_file"_L1, QFile::encodeName(d->selectedFiles.first()).append('\0'));
-            options.insert("current_name"_L1, QFileInfo(d->selectedFiles.first()).fileName());
-        }
+    if (!d->directory.isEmpty())
+        options.insert("current_folder"_L1, QFile::encodeName(d->directory).append('\0'));
+
+    if (d->saveFile && !d->selectedFiles.isEmpty()) {
+        // current_file for the file to be pre-selected, current_name for the file name to be
+        // pre-filled current_file accepts absolute path and requires the file to exist while
+        // current_name accepts just file name
+        QFileInfo selectedFileInfo(d->selectedFiles.constFirst());
+        if (selectedFileInfo.exists())
+            options.insert("current_file"_L1,
+                           QFile::encodeName(d->selectedFiles.constFirst()).append('\0'));
+        options.insert("current_name"_L1, selectedFileInfo.fileName());
     }
 
     // Insert filters
@@ -211,6 +213,9 @@ void QXdgDesktopPortalFileDialog::openPortal(Qt::WindowFlags windowFlags, Qt::Wi
             filter.name = mimeType.comment();
             filter.filterConditions = filterConditions;
 
+            if (filter.name.isEmpty())
+                filter.name = mimeTypefilter;
+
             filterList << filter;
 
             if (!d->selectedMimeTypeFilter.isEmpty() && d->selectedMimeTypeFilter == mimeTypefilter)