diff --git a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
index ca98e3b388..729cb99bbe 100644
--- a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
+++ b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
@@ -234,7 +234,9 @@ export default [{
     params: {
         template_search: {
             value: {
-                project__organization: null
+                or__project__organization: null,
+                or__inventory__organization: null,
+                page_size: 20
             }
         }
     },
@@ -279,7 +281,8 @@ export default [{
         OrgJobTemplateDataset: ['OrgJobTemplateList', 'QuerySet', '$stateParams', 'GetBasePath',
             function(list, qs, $stateParams, GetBasePath) {
                 let path = GetBasePath(list.name);
-                $stateParams.template_search.project__organization = $stateParams.organization_id;
+                $stateParams.template_search.or__project__organization = $stateParams.organization_id;
+                $stateParams.template_search.or__inventory__organization = $stateParams.organization_id;
                 return qs.search(path, $stateParams.template_search);
             }
         ]