diff --git a/awx/ui/client/features/users/tokens/users-tokens-add-application.route.js b/awx/ui/client/features/users/tokens/users-tokens-add-application.route.js
index 13197ca11d..f647fc5edf 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-add-application.route.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-add-application.route.js
@@ -42,14 +42,19 @@ export default {
                 name: {
                     key: true,
                     label: 'Name',
-                    columnClass: 'col-lg-4 col-md-6 col-sm-8 col-xs-8',
+                    columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-4',
                     awToolTip: '{{application.description | sanitize}}',
                     dataPlacement: 'top'
                 },
-            },
-            actions: {
-            },
-            fieldActions: {
+                organization: {
+                    label: 'Organization',
+                    columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-4',
+                    modalColumnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-4',
+                    key: false,
+                    ngBind: 'application.summary_fields.organization.name',
+                    sourceModel: 'organization',
+                    includeModal: true
+                }
             }
         })],
         Dataset: ['QuerySet', 'GetBasePath', '$stateParams', 'ListDefinition',
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index b529cb2788..92fb28cf71 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -545,22 +545,27 @@ export default ['$compile', 'Attr', 'Icon',
                     }
                 }
                 if (options.mode === 'lookup') {
-                    let customClass = list.fields.name.modalColumnClass || '';
-                    html += `<th
-                            base-path="${list.basePath || list.name}"
-                            collection="${list.name}"
-                            dataset="${list.iterator}_dataset"
-                            column-sort
-                            column-field="name"
-                            column-iterator="${list.iterator}"
-                            column-no-sort="${list.fields.name.nosort}"
-                            column-label="${list.fields.name.label}"
-                            column-custom-class="${customClass}"
-                            query-set="${list.iterator}_queryset">
-                        </th>`;
+                    for (fld in list.fields) {
+                        if(fld === 'name' || _.has(list.fields[fld], 'includeModal')){
+                            let customClass = list.fields.name.modalColumnClass || '';
+                            html += `<th
+                                base-path="${list.basePath || list.name}"
+                                collection="${list.name}"
+                                dataset="${list.iterator}_dataset"
+                                column-sort
+                                column-field="name"
+                                column-iterator="${list.iterator}"
+                                column-no-sort="${list.fields.name.nosort}"
+                                column-label="${list.fields[fld].label}"
+                                column-custom-class="${customClass}"
+                                query-set="${list.iterator}_queryset">
+                            </th>`;
+                        }
+                        
+                    }
 
                     if(list.fields.info) {
-                        customClass = list.fields.name.modalColumnClass || '';
+                        let customClass = list.fields.name.modalColumnClass || '';
                         const infoHeaderClass = _.get(list.fields.info, 'infoHeaderClass', 'List-tableHeader--info');
                         html += `<th
                                     class="${infoHeaderClass}"