1 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 869e94b566..14bc26f770 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -1495,8 +1495,9 @@ QWindowsNativeDialogBase *QWindowsFileDialogHelper::createNativeDialog()
     // Apply settings.
     const QSharedPointer<QFileDialogOptions> &opts = options();
     m_data.fromOptions(opts);
+    const QFileDialogOptions::FileMode mode = opts->fileMode();
     result->setWindowTitle(opts->windowTitle());
-    result->setMode(opts->fileMode(), opts->options());
+    result->setMode(mode, opts->options());
     result->setHideFiltersDetails(opts->testOption(QFileDialogOptions::HideNameFilterDetails));
     const QStringList nameFilters = opts->nameFilters();
     if (!nameFilters.isEmpty())
@@ -1513,6 +1514,12 @@ QWindowsNativeDialogBase *QWindowsFileDialogHelper::createNativeDialog()
         if (!info.isDir())
             result->selectFile(info.fileName());
     }
+    // No need to select initialNameFilter if mode is Dir
+    if (mode != QFileDialogOptions::Directory && mode != QFileDialogOptions::DirectoryOnly) {
+        const QString initialNameFilter = opts->initiallySelectedNameFilter();
+        if (!initialNameFilter.isEmpty())
+            result->selectNameFilter(initialNameFilter);
+    }
     const QString defaultSuffix = opts->defaultSuffix();
     if (!defaultSuffix.isEmpty())
         result->setDefaultSuffix(defaultSuffix);