diff --git a/spec/atom-environment-spec.js b/spec/atom-environment-spec.js
index e3b7b83e7..70ca9c309 100644
--- a/spec/atom-environment-spec.js
+++ b/spec/atom-environment-spec.js
@@ -592,7 +592,7 @@ describe('AtomEnvironment', () => {
       const promise = new Promise((r) => { resolve = r })
       envLoaded = () => {
         resolve()
-        promise
+        return promise
       }
       atomEnvironment = new AtomEnvironment({
         applicationDelegate: atom.applicationDelegate,
diff --git a/src/atom-environment.js b/src/atom-environment.js
index 50a41fb53..ae0ba8276 100644
--- a/src/atom-environment.js
+++ b/src/atom-environment.js
@@ -1013,8 +1013,10 @@ class AtomEnvironment {
   }
 
   addProjectFolder () {
-    this.pickFolder((selectedPaths = []) => {
-      this.addToProject(selectedPaths)
+    return new Promise((resolve) => {
+      this.pickFolder((selectedPaths) => {
+        this.addToProject(selectedPaths || []).then(resolve)
+      })
     })
   }