diff --git a/spec/git-spec.coffee b/spec/git-spec.coffee
index c84ff6aa9..df0a72efd 100644
--- a/spec/git-spec.coffee
+++ b/spec/git-spec.coffee
@@ -249,6 +249,36 @@ describe "GitRepository", ->
         expect(repo.isStatusModified(status)).toBe false
         expect(repo.isStatusNew(status)).toBe false
 
+    it 'caches the proper statuses when multiple project are open', ->
+      otherWorkingDirectory = copyRepository()
+
+      atom.project.setPaths([workingDirectory, otherWorkingDirectory])
+
+      waitsForPromise ->
+        atom.workspace.open('b.txt')
+
+      statusHandler = null
+      runs ->
+        repo = atom.project.getRepositories()[0]
+
+        statusHandler = jasmine.createSpy('statusHandler')
+        repo.onDidChangeStatuses statusHandler
+        repo.refreshStatus()
+
+      waitsFor ->
+        statusHandler.callCount > 0
+
+      runs ->
+        subDir = path.join(workingDirectory, 'dir')
+        fs.mkdirSync(subDir)
+
+        filePath = path.join(subDir, 'b.txt')
+        fs.writeFileSync(filePath, '')
+
+        status = repo.getCachedPathStatus(filePath)
+        expect(repo.isStatusModified(status)).toBe true
+        expect(repo.isStatusNew(status)).toBe false
+
   describe "buffer events", ->
     [editor] = []
 
diff --git a/src/git-repository.coffee b/src/git-repository.coffee
index cf85cb076..244a6abad 100644
--- a/src/git-repository.coffee
+++ b/src/git-repository.coffee
@@ -465,8 +465,7 @@ class GitRepository
 
     relativeProjectPaths = @project?.getPaths()
       .map (path) => @relativize(path)
-      .filter (path) -> path.length > 0
-      .map (path) -> path + '/**'
+      .map (path) -> if path.length > 0 then path + '/**' else '*'
 
     @statusTask?.terminate()
     @statusTask = Task.once @handlerPath, @getPath(), relativeProjectPaths, ({statuses, upstream, branch, submodules}) =>