diff --git a/awx/ui/client/src/controllers/JobTemplates.js b/awx/ui/client/src/controllers/JobTemplates.js
index 07e059a6a4..b8b37c5a72 100644
--- a/awx/ui/client/src/controllers/JobTemplates.js
+++ b/awx/ui/client/src/controllers/JobTemplates.js
@@ -236,6 +236,10 @@ export function JobTemplatesList($scope, $rootScope, $location, $log,
     $scope.submitJob = function (id) {
         PlaybookRun({ scope: $scope, id: id });
     };
+
+    $scope.scheduleJob = function (id) {
+        $state.transitionTo('jobTemplateSchedules', {id: id});
+    }
 }
 
 JobTemplatesList.$inject = ['$scope', '$rootScope', '$location', '$log',
diff --git a/awx/ui/client/src/helpers/Schedules.js b/awx/ui/client/src/helpers/Schedules.js
index 5fae4612a2..59af9229a2 100644
--- a/awx/ui/client/src/helpers/Schedules.js
+++ b/awx/ui/client/src/helpers/Schedules.js
@@ -711,7 +711,7 @@ export default
                     scope: scope,
                     searchSize: (searchSize) ? searchSize : 'col-lg-6 col-md-6 col-sm-6 col-xs-12',
                     showSearch: true,
-                    title: false
+                    title: true
                 });
 
                 SearchInit({
diff --git a/awx/ui/client/src/lists/JobTemplates.js b/awx/ui/client/src/lists/JobTemplates.js
index 9f2117787c..55ed708df2 100644
--- a/awx/ui/client/src/lists/JobTemplates.js
+++ b/awx/ui/client/src/lists/JobTemplates.js
@@ -65,7 +65,7 @@ export default
             schedule: {
                 label: 'Schedule',
                 mode: 'all',
-                ngHref: '#/job_templates/{{ job_template.id }}/schedules',
+                ngClick: 'scheduleJob(job_template.id)',
                 awToolTip: 'Schedule future job template runs',
                 dataPlacement: 'top',
             },
diff --git a/awx/ui/client/src/lists/ScanJobs.js b/awx/ui/client/src/lists/ScanJobs.js
index 9fb1f3180e..457a7d2d1e 100644
--- a/awx/ui/client/src/lists/ScanJobs.js
+++ b/awx/ui/client/src/lists/ScanJobs.js
@@ -52,7 +52,7 @@ export default
             schedule: {
                 label: 'Schedule',
                 mode: 'all',
-                ngHref: '#/job_templates/{{ job_template.id }}/schedules',
+                ngClick: 'scheduleJob(job_template.id)',
                 awToolTip: 'Schedule future job template runs',
                 dataPlacement: 'top',
             },
diff --git a/awx/ui/client/src/lists/Schedules.js b/awx/ui/client/src/lists/Schedules.js
index 9384652137..2e47d6a03d 100644
--- a/awx/ui/client/src/lists/Schedules.js
+++ b/awx/ui/client/src/lists/Schedules.js
@@ -13,7 +13,7 @@ export default
         iterator: 'schedule',
         selectTitle: '',
         editTitle: 'Schedules',
-        well: false,
+        listTitle: 'Schedules',
         index: false,
         hover: true,
 
diff --git a/awx/ui/client/src/partials/schedule_detail.html b/awx/ui/client/src/partials/schedule_detail.html
index ab363d55e7..f388303303 100644
--- a/awx/ui/client/src/partials/schedule_detail.html
+++ b/awx/ui/client/src/partials/schedule_detail.html
@@ -1,7 +1,5 @@
-<div class="row">
-    <div class="col-sm-12">
-        <div id="schedule-list-target"></div>
-    </div>
+<div class="Panel">
+    <div id="schedule-list-target"></div>
 </div>
 
 <div ng-include="'/static/partials/schedule_dialog.html'"></div>