diff --git a/awx/ui/static/js/smart-status/smart-status.controller.js b/awx/ui/static/js/smart-status/smart-status.controller.js
index 72b76bbe5b..12ba8022ea 100644
--- a/awx/ui/static/js/smart-status/smart-status.controller.js
+++ b/awx/ui/static/js/smart-status/smart-status.controller.js
@@ -14,7 +14,7 @@ export default ['$scope', '$filter',
         }
 
         var sparkData =
-            recentJobs.map(function(job) {
+            _.sortBy(recentJobs.map(function(job) {
 
                 var data = {};
 
@@ -28,10 +28,10 @@ export default ['$scope', '$filter',
 
                 data.jobId = job.id;
                 data.smartStatus = job.status;
-                data.finished = $filter('longDate')(job.finished);
+                data.finished = $filter('longDate')(job.finished) || "running";
 
                 return data;
-            });
+            }), "finished").reverse();
 
         $scope.sparkArray = _.pluck(sparkData, 'value');
         $scope.jobIds = _.pluck(sparkData, 'jobId');
diff --git a/awx/ui/static/js/smart-status/smart-status.directive.js b/awx/ui/static/js/smart-status/smart-status.directive.js
index d220fa7e86..3a59e5a511 100644
--- a/awx/ui/static/js/smart-status/smart-status.directive.js
+++ b/awx/ui/static/js/smart-status/smart-status.directive.js
@@ -18,10 +18,13 @@ export default [  function() {
                 //capitalize first letter
                 if (status) {
                     status = status.charAt(0).toUpperCase() + status.slice(1);
-                    return "<div class=\"smart-status-tooltip\">Job ID: " +
+                    var tooltip = "<div class=\"smart-status-tooltip\">Job ID: " +
                       options.userOptions.tooltipValueLookups.jobs[point.offset] +
-                      "<br>Status: <span style=\"color: " + point.color + "\">&#9679;</span>"+status+
-                      "<br>Finished: " + finished +"</div>" ;
+                      "<br>Status: <span style=\"color: " + point.color + "\">&#9679;</span>"+status;
+                    if (finished !== "running") {
+                        tooltip += "<br>Finished: " + finished +"</div>" ;
+                    }
+                    return tooltip;
                 }
             };