diff --git a/addon/ng2/blueprints/ng2/files/src/index.html b/addon/ng2/blueprints/ng2/files/src/index.html
index bc847cb45a05..39fa32198eb7 100644
--- a/addon/ng2/blueprints/ng2/files/src/index.html
+++ b/addon/ng2/blueprints/ng2/files/src/index.html
@@ -10,6 +10,7 @@
 <body>
   <<%= htmlComponentName %>-app>Loading...</<%= htmlComponentName %>-app>
 
+  <script src="vendor/es6-shim/es6-shim.js"></script>
   <script src="thirdparty/vendor.js"></script>
   <script src="thirdparty/libs.js"></script>
   <script>
diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
index af3ce5faff04..bb649c77bec5 100644
--- a/lib/broccoli/angular2-app.js
+++ b/lib/broccoli/angular2-app.js
@@ -27,7 +27,7 @@ Angular2App.prototype.toTree = function() {
       'systemjs/dist/system.src.js',
       'systemjs/dist/system-polyfills.js'
     ];
-    
+
     if (this.options.vendorNpmFiles) {
       vendorNpmFiles = vendorNpmFiles.concat(this.options.vendorNpmFiles);
     }
@@ -49,23 +49,24 @@ Angular2App.prototype.toTree = function() {
         exclude: ['**/*.ts', '**/*.js', 'src/tsconfig.json'],
         allowEmpty: true
     });
-    
+
     var vendorNpmTree = new Funnel('node_modules', {
       files: vendorNpmFiles,
       destDir: 'vendor'
     });
-    
+
     var vendorNpmJs = new Concat(vendorNpmTree, {
       inputFiles: [ //TODO: figure out how to make it a glob that maintains the order of the files
+        //TODO: figure out why loading es6-shim from within here causes browser errors
+        // '**/es6-shim.js',
+        '**/system-polyfills.js',
         '**/angular2-polyfills.js',
         '**/system.src.js',
-        '**/system-polyfills.js',
-        '**/es6-shim.js',
+        '**/Rx.js',
         '**/angular2.dev.js',
         '**/http.dev.js',
         '**/router.dev.js',
-        '**/upgrade.dev.js',
-        '**/Rx.js'
+        '**/upgrade.dev.js'
       ],
       outputFile: '/thirdparty/vendor.js'
     });
@@ -90,11 +91,12 @@ Angular2App.prototype.toTree = function() {
     // });
 
     return mergeTrees([
-      assetTree, 
-      tsSrcTree, 
-      tsTree, 
-      jsTree, 
-      this.index(), 
+      vendorNpmTree,
+      assetTree,
+      tsSrcTree,
+      tsTree,
+      jsTree,
+      this.index(),
       vendorNpmJs,
       thirdPartyJs
     ], { overwrite: true });
