diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js
index 2780e63ce1..7c2151471d 100644
--- a/awx/ui/client/features/jobs/jobsList.controller.js
+++ b/awx/ui/client/features/jobs/jobsList.controller.js
@@ -62,6 +62,15 @@ function ListJobsController (
 
     vm.jobTypes = mapChoices(unifiedJob.options('actions.GET.type.choices'));
 
+    vm.buildCredentialTags = (credentials) =>
+        credentials.map(credential => {
+            const icon = `${credential.kind}`;
+            const link = `/#/credentials/${credential.id}`;
+            const value = credential.name;
+
+            return { icon, link, value };
+        });
+
     vm.getSref = ({ type, id }) => {
         let sref;
 
diff --git a/awx/ui/client/features/jobs/jobsList.view.html b/awx/ui/client/features/jobs/jobsList.view.html
index 72d40c6130..190eba8ff7 100644
--- a/awx/ui/client/features/jobs/jobsList.view.html
+++ b/awx/ui/client/features/jobs/jobsList.view.html
@@ -65,6 +65,7 @@
                     label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_CREDENTIALS') }}"
                     tag-values="job.summary_fields.credentials"
                     tags-are-creds="true">
+                    <at-toggle-tag ng-init="credTags=vm.buildCredentialTags(job.summary_fields.credentials)" tags="credTags"></at-toggle-tag>
                 </at-row-item>
                 <labels-list class="LabelList" show-delete="false" is-row-item="true" state="job">
                 </labels-list>