diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index 887e362e02..e53e0660d7 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -102,8 +102,9 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA
                         job_template_search: {
                             value: {
                                 page_size: '5',
-                                type: 'job_template',
-                                order_by: 'name'
+                                order_by: 'name',
+                                inventory__isnull: false,
+                                credential__isnull: false
                             },
                             squash: true,
                             dynamic: true
@@ -459,6 +460,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplatesA
                                 list.fields.name.columnClass = "col-md-8";
                                 list.iterator = 'job_template';
                                 list.name = 'job_templates';
+                                list.basePath = "job_templates";
                                 list.fields.info = {
                                     ngInclude: "'/static/partials/job-template-details.html'",
                                     type: 'template',