diff --git a/awx/ui/static/js/lists/JobEvents.js b/awx/ui/static/js/lists/JobEvents.js
index b402060fba..8dc69e7c7d 100644
--- a/awx/ui/static/js/lists/JobEvents.js
+++ b/awx/ui/static/js/lists/JobEvents.js
@@ -23,7 +23,7 @@ angular.module('JobEventsListDefinition', [])
                 key: true,
                 nosort: true,
                 searchable: false,
-                ngClick: "viewJobEvent(\{\{ jobevent.id \}\})",
+                link: false
                 },
             status: {
                 label: 'Status',
@@ -38,13 +38,12 @@ angular.module('JobEventsListDefinition', [])
             event_display: {
                 label: 'Event',
                 hasChildren: true,
-                ngClick: "viewJobEvent(\{\{ jobevent.id \}\})",
+                ngClick: "toggleChildren(\{\{ jobevent.id \}\}, '\{\{ jobevent.related.children \}\}')",
                 nosort: true,
                 searchable: false
                 },
             host: {
                 label: 'Host',
-                ngClick: "viewJobEvent(\{\{ jobevent.id \}\})",
                 ngBind: 'jobevent.summary_fields.host.name',
                 searchField: 'hosts__name',
                 nosort: true,
diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js
index 56b5943903..3b00c38b54 100644
--- a/awx/ui/static/lib/ansible/generator-helpers.js
+++ b/awx/ui/static/lib/ansible/generator-helpers.js
@@ -105,7 +105,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
           else if (field.ngClick) {
              html += "<a href=\"\"" + Attr(field, 'ngClick') + "\">";
           }
-          else {
+          else if (field.link == undefined || field.link) {
              html += "<a href=\"#/" + base + "/{{" + list.iterator + ".id }}\">";
           }
         }