diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp
index 04848a38e52..8828e09e8f0 100644
--- a/src/corelib/io/qstandardpaths.cpp
+++ b/src/corelib/io/qstandardpaths.cpp
@@ -182,7 +182,7 @@ QT_BEGIN_NAMESPACE
          \li "C:/Users/<USER>/AppData/Local/<APPNAME>/cache"
     \row \li GenericDataLocation
          \li "~/Library/Application Support", "/Library/Application Support"
-         \li "C:/Users/<USER>/AppData/Local", "C:/ProgramData"
+         \li "C:/Users/<USER>/AppData/Local", "C:/ProgramData", "<APPDIR>", "<APPDIR>/data"
     \row \li RuntimeLocation
          \li "~/Library/Application Support"
          \li "C:/Users/<USER>"
diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp
index b1d5821a978..0a13f94f050 100644
--- a/src/corelib/io/qstandardpaths_win.cpp
+++ b/src/corelib/io/qstandardpaths_win.cpp
@@ -212,10 +212,8 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
                 }
                 dirs.append(result);
 #ifndef QT_BOOTSTRAPPED
-                if (type != GenericDataLocation) {
-                    dirs.append(QCoreApplication::applicationDirPath());
-                    dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
-                }
+                dirs.append(QCoreApplication::applicationDirPath());
+                dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
 #endif
             }
             break;