diff --git a/qtbase/src/corelib/io/qfileselector.cpp b/qtbase/src/corelib/io/qfileselector.cpp
index ee378f6434..22ffc2f6aa 100644
--- a/qtbase/src/corelib/io/qfileselector.cpp
+++ b/qtbase/src/corelib/io/qfileselector.cpp
@@ -278,7 +278,16 @@ QString QFileSelectorPrivate::select(const QString &filePath) const
     Q_Q(const QFileSelector);
     QFileInfo fi(filePath);
 
-    QString ret = selectionHelper(fi.path().isEmpty() ? QString() : fi.path() + QLatin1Char('/'),
+    Qstring path = QString();
+    if (!fi.path().isEmpty()) {
+        if (fi.path().endsWith('/')) {
+            path = fi.path();
+	} else {
+            path = fi.path() + QLatin1Char('/');
+	}
+    }
+
+    QString ret = selectionHelper(path,
             fi.fileName(), q->allSelectors());
 
     if (!ret.isEmpty())