diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp
index faa41ba82e..5ada39db60 100644
--- a/src/Gui/FileDialog.cpp
+++ b/src/Gui/FileDialog.cpp
@@ -202,11 +202,14 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption,
 
         QStringList filterSuffixes;
         getSuffixesDescription(filterSuffixes, filterToSearch);
-        QString fiSuffix = QLatin1String("*.") + fi.suffix();  // To match with filterSuffixes
-        if (fi.suffix().isEmpty() || !filterSuffixes.contains(fiSuffix)) {
+        const QString fiSuffix = fi.suffix();
+        const QString dotSuffix = QLatin1String("*.") + fiSuffix;  // To match with filterSuffixes
+        if (fiSuffix.isEmpty() || !filterSuffixes.contains(dotSuffix)) {
             // there is no suffix or not a suffix that matches the filter, so
             // default to the first suffix of the filter
-            dirName += filterSuffixes[0].mid(1);
+            if (!filterSuffixes.isEmpty()) {
+                dirName += filterSuffixes[0].mid(1);
+            }
         }
     }