diff --git a/awx/ui/client/src/lists/ScheduledJobs.js b/awx/ui/client/src/lists/ScheduledJobs.js
index a771a75b8f..8afde66081 100644
--- a/awx/ui/client/src/lists/ScheduledJobs.js
+++ b/awx/ui/client/src/lists/ScheduledJobs.js
@@ -31,7 +31,9 @@ export default
             name: {
                 label: i18n._('Name'),
                 columnClass: 'col-lg-4 col-md-5 col-sm-5 col-xs-7 List-staticColumnAdjacent',
-                ngBind: 'schedule.summary_fields.unified_job_template.name',
+                sourceModel: 'unified_job_template',
+                sourceField: 'name',
+                // ngBind: 'schedule.summary_fields.unified_job_template.name',
                 ngClick: "editSchedule(schedule)",
                 awToolTip: "{{ schedule.nameTip | sanitize}}",
                 dataTipWatch: 'schedule.nameTip',
diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js
index 4f9e9809d3..8652e8a2e6 100644
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@@ -126,6 +126,26 @@ export default [
                 let deferred = $q.defer();
 
                 switch(schedule.summary_fields.unified_job_template.unified_job_type){
+                case 'job':
+                    deferred.resolve({
+                        name: 'jobTemplateSchedules.edit',
+                        params: {
+                            id: schedule.unified_job_template,
+                            schedule_id: schedule.id
+                        }
+                    });
+                    break;
+
+                    case 'workflow_job':
+                        deferred.resolve({
+                            name: 'workflowJobTemplateSchedules.edit',
+                            params: {
+                                id: schedule.unified_job_template,
+                                schedule_id: schedule.id
+                            }
+                        });
+                        break;
+
                     case 'inventory_update':
                         Rest.setUrl(schedule.related.unified_job_template);
                         Rest.get().then( (res) => {