diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js
index 69ec573cd1..2c5ff4d212 100644
--- a/awx/ui/static/js/controllers/JobDetail.js
+++ b/awx/ui/static/js/controllers/JobDetail.js
@@ -593,19 +593,23 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
     }, 500));
 
     scope.selectPlay = function(id) {
-        scope.auto_scroll_plays = false;
-        SelectPlay({
-            scope: scope,
-            id: id
-        });
+        if (!scope.liveEventProcessing) {
+            scope.auto_scroll_plays = false;
+            SelectPlay({
+                scope: scope,
+                id: id
+            });
+        }
     };
 
     scope.selectTask = function(id) {
-        scope.auto_scroll_tasks = false;
-        SelectTask({
-            scope: scope,
-            id: id
-        });
+        if (!scope.liveEventProcessing) {
+            scope.auto_scroll_tasks = false;
+            SelectTask({
+                scope: scope,
+                id: id
+            });
+        }
     };
 
     scope.toggleSummary = function(hide) {
diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js
index 9430420562..78e0542014 100644
--- a/awx/ui/static/js/helpers/JobDetail.js
+++ b/awx/ui/static/js/helpers/JobDetail.js
@@ -968,7 +968,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
         }
         scope.plays = result;
         if (scope.liveEventProcessing) {
-            scope.$emit('FixPlaysScroll');
+            $('#plays-table-detail').scrollTop($('#plays-table-detail').prop("scrollHeight"));
         }
     };
 }])
@@ -1005,7 +1005,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
 
         scope.tasks = result;
         if (scope.liveEventProcessing) {
-            scope.$emit('FixTasksScroll');
+            $('#tasks-table-detail').scrollTop($('#tasks-table-detail').prop("scrollHeight"));
         }
     };
 }])
@@ -1043,7 +1043,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
         }
         scope.hostResults = result;
         if (scope.liveEventProcessing) {
-            scope.$emit('FixHostResultsScroll');
+            $('#hosts-table-detail').scrollTop($('#hosts-table-detail').prop("scrollHeight"));
         }
     };
 }])
diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html
index b751b52fe2..6cfa55fdfb 100644
--- a/awx/ui/static/partials/job_detail.html
+++ b/awx/ui/static/partials/job_detail.html
@@ -81,11 +81,10 @@
                                     <div class="col-lg-1 col-md-1 col-sm-2 hidden-xs">Started</div>
                                     <div class="col-lg-1 col-md-1 hidden-sm hidden-xs">Elapsed</div>
                                     <div class="col-lg-10 col-md-10 col-sm-10 col-xs-12">Name</div>
-                                    <!-- <div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">Reporting Hosts</div>
-                                    <div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">Unreachable Hosts</div> -->
                                 </div>
                             </div>
-                            <div id="plays-table-detail" aw-custom-scroll class="table-detail">
+                            <div id="plays-table-detail" class="table-detail" lr-infinite-scroll="playsScrollDown"
+                                scroll-threshold="10" time-threshold="500">
                                 <div class="row cursor-pointer" ng-repeat="play in playList = (plays | FilterById : search_all_plays | FilterFailedEvents : liveEventProcessing : searchAllStatus) track by $index"
                                         ng-class="play.playActiveClass" ng-click="selectPlay(play.id)">
                                     <div class="col-lg-1 col-md-1 col-sm-2 hidden-xs">{{ play.created | date: 'HH:mm:ss' }}</div>
@@ -96,8 +95,6 @@
                                         aw-tool-tip="{{ play.status_tip }}" data-tip-watch="play.status_tip" data-placement="top">
                                         <i class="fa icon-job-{{ play.status }}"></i> {{ play.name }}</span>
                                     </div>
-                                    <!--<div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">{{ play.hostCount }}</div>
-                                    <div class="col-lg-2 col-md-2 hidden-sm hidden-xs text-right">{{ play.unreachableCount }}</div>-->
                                 </div>
                                 <div class="row" ng-show="playList.length == 0">
                                     <div class="col-lg-12">
@@ -105,6 +102,7 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="scroll-spinner" id="playsMoreRows"><i class="fa fa-cog fa-spin"></i></div>
                         </div><!-- section -->
 
                         <div id="task-section" class="section" tasks=>