diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js
index af1622c148..5e68cb1aa5 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -96,6 +96,8 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
         $scope.followTooltip = "Currently following standard out as it comes in.  Click to unfollow.";
     }
 
+    $scope.events = {};
+
     // EVENT STUFF BELOW
 
     // This is where the async updates to the UI actually happen.
@@ -145,10 +147,21 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
 
                     if(change === 'stdout'){
                         // put stdout elements in stdout container
+
+                        // this scopes the event to that particular
+                        // block of stdout.
+                        // If you need to see the event a particular
+                        // stdout block is from, you can:
+                        // angular.element($0).scope().event
+                        $scope.events[mungedEvent.counter] = $scope.$new();
+                        $scope.events[mungedEvent.counter]
+                            .event = mungedEvent;
+
                         angular
                             .element(".JobResultsStdOut-stdoutContainer")
                             .append($compile(mungedEvent
-                                .stdout)($scope));
+                                .stdout)($scope.events[mungedEvent
+                                    .counter]));
 
                         // move the followAnchor to the bottom of the
                         // container
@@ -158,6 +171,11 @@ export default ['jobData', 'jobDataOptions', 'jobLabels', 'jobFinished', 'count'
                         // if follow is engaged,
                         // scroll down to the followAnchor
                         if ($scope.followEngaged) {
+                            if (!$scope.followScroll) {
+                                $scope.followScroll = function() {
+                                    return null;
+                                }
+                            }
                             $scope.followScroll();
                         }
                     }
diff --git a/awx/ui/tests/spec/job-results/job-results.controller-test.js b/awx/ui/tests/spec/job-results/job-results.controller-test.js
index 11e5275cd2..bcb8c4f9f8 100644
--- a/awx/ui/tests/spec/job-results/job-results.controller-test.js
+++ b/awx/ui/tests/spec/job-results/job-results.controller-test.js
@@ -39,7 +39,6 @@ describe('Controller: jobResultsController', () => {
                 'populate',
                 'markProcessed'
             ]);
-            $compile = jasmine.createSpy('$compile');
 
             $provide.value('jobData', jobData);
             $provide.value('jobDataOptions', jobDataOptions);
@@ -50,7 +49,6 @@ describe('Controller: jobResultsController', () => {
             $provide.value('ParseVariableString', ParseVariableString);
             $provide.value('jobResultsService', jobResultsService);
             $provide.value('eventQueue', eventQueue);
-            $provide.value('$compile', $compile);
         });
     };
 
@@ -554,6 +552,25 @@ describe('Controller: jobResultsController', () => {
             });
         });
 
-        // TODO: stdout change tests
+        describe('populate - stdout', () => {
+            beforeEach(() => {
+
+                populateResolve = {
+                    counter: 12,
+                    stdout: "line",
+                    changes: ['stdout']
+                };
+
+                bootstrapTest();
+
+                $scope.followEngaged = true;
+
+                $scope.$apply();
+            });
+
+            it('creates new child scope for the event', () => {
+                expect($scope.events[12].event).toBe(populateResolve);
+            });
+        });
     });
 });