diff --git a/src/app/config.coffee b/src/app/config.coffee
index 9b38891a4..1bf22cae2 100644
--- a/src/app/config.coffee
+++ b/src/app/config.coffee
@@ -8,6 +8,7 @@ pathWatcher = require 'pathwatcher'
 
 configDirPath = fsUtils.absolute("~/.atom")
 bundledPackagesDirPath = fsUtils.join(resourcePath, "src/packages")
+nodeModulesDirPath = fsUtils.join(resourcePath, "node_modules")
 bundledThemesDirPath = fsUtils.join(resourcePath, "themes")
 vendoredPackagesDirPath = fsUtils.join(resourcePath, "vendor/packages")
 vendoredThemesDirPath = fsUtils.join(resourcePath, "vendor/themes")
@@ -23,7 +24,7 @@ module.exports =
 class Config
   configDirPath: configDirPath
   themeDirPaths: [userThemesDirPath, bundledThemesDirPath, vendoredThemesDirPath]
-  bundledPackageDirPaths: [vendoredPackagesDirPath, bundledPackagesDirPath]
+  bundledPackageDirPaths: [vendoredPackagesDirPath, bundledPackagesDirPath, nodeModulesDirPath]
   packageDirPaths: [userPackagesDirPath, vendoredPackagesDirPath, bundledPackagesDirPath]
   userPackagesDirPath: userPackagesDirPath
   userStoragePath: userStoragePath
diff --git a/src/app/package-config-view.coffee b/src/app/package-config-view.coffee
index eb403fca5..07cfd2824 100644
--- a/src/app/package-config-view.coffee
+++ b/src/app/package-config-view.coffee
@@ -139,6 +139,7 @@ class PackageConfigView extends View
       for packageDirPath in config.bundledPackageDirPaths
         if packagePath.indexOf("#{packageDirPath}/") is 0
           @bundled = true
+          break
 
       version = loadedPackage?.metadata.version
       unless version
diff --git a/vendor/apm b/vendor/apm
index 831bf348c..13385e0b3 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 831bf348c7acc4037e516c9f27bc37eb9a83aae3
+Subproject commit 13385e0b36db757b0f7a97faecdffbe5ac363c4b