diff --git a/CHANGELOG.md b/CHANGELOG.md
index b62ebf7358..14ec287b01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ Please add one entry in this file for each change in Yarn's behavior. Use the sa
 - Improves PnP compatibility with Node 6
 
   [#6871](https://github.com/yarnpkg/yarn/pull/6871) - [**Robert Jackson**](https://github.com/rwjblue)
+  
+- Fixes PnP detection with workspaces (`installConfig` is now read at the top-level)
+
+  [#6878](https://github.com/yarnpkg/yarn/pull/6878) - [**Maël Nison**](https://twitter.com/arcanis)
 
 ## 1.13.0
 
diff --git a/src/config.js b/src/config.js
index 97af68ac20..e09d8e5b34 100644
--- a/src/config.js
+++ b/src/config.js
@@ -383,7 +383,7 @@ export default class Config {
       this._cacheRootFolder = String(cacheRootFolder);
     }
 
-    const manifest = await this.maybeReadManifest(this.cwd);
+    const manifest = await this.maybeReadManifest(this.lockfileFolder);
 
     const plugnplayByEnv = this.getOption('plugnplay-override');
     if (plugnplayByEnv != null) {