diff --git a/awx/ui/client/features/_index.less b/awx/ui/client/features/_index.less
index b7165c94c9..2769b29de7 100644
--- a/awx/ui/client/features/_index.less
+++ b/awx/ui/client/features/_index.less
@@ -1,5 +1,6 @@
 @import 'portalMode/_index';
 @import 'output/_index';
+@import 'credentials/_index';
 
 /** @define Popup Modal after create new token and applicaiton and save form */
 .PopupModal {
diff --git a/awx/ui/client/features/credentials/_index.less b/awx/ui/client/features/credentials/_index.less
new file mode 100644
index 0000000000..51d407ca2d
--- /dev/null
+++ b/awx/ui/client/features/credentials/_index.less
@@ -0,0 +1,21 @@
+.InputSourceLookup-selectedItem {
+    display: flex;
+    flex: 0 0 100%;
+    align-items: center;
+    min-height: 50px;
+    margin-top: 16px;
+    border-radius: 5px;
+    background-color: @default-no-items-bord;
+    border: 1px solid @default-border;
+}
+
+.InputSourceLookup-selectedItemLabel {
+    color: @default-interface-txt;
+    text-transform: uppercase;
+    margin-right: 10px;
+    margin-left: 10px;
+}
+
+.InputSourceLookup-selectedItemText {
+    font-style: italic;
+}
diff --git a/awx/ui/client/features/credentials/add-edit-credentials.controller.js b/awx/ui/client/features/credentials/add-edit-credentials.controller.js
index f912d1919f..8c47d40637 100644
--- a/awx/ui/client/features/credentials/add-edit-credentials.controller.js
+++ b/awx/ui/client/features/credentials/add-edit-credentials.controller.js
@@ -338,7 +338,7 @@ function AddEditCredentialsController (
         }
     };
 
-    vm.onInputSourceRowClick = ({ id, credential_type, name }) => {
+    vm.onInputSourceItemSelect = ({ id, credential_type, name }) => {
         vm.inputSources.credentialId = id;
         vm.inputSources.credentialName = name;
         vm.inputSources.credentialTypeId = credential_type;
diff --git a/awx/ui/client/features/credentials/add-edit-credentials.view.html b/awx/ui/client/features/credentials/add-edit-credentials.view.html
index 45c6568552..b642a6da07 100644
--- a/awx/ui/client/features/credentials/add-edit-credentials.view.html
+++ b/awx/ui/client/features/credentials/add-edit-credentials.view.html
@@ -46,13 +46,14 @@
 <at-input-source-lookup
     ng-if="vm.inputSources.field"
     selected-id="vm.inputSources.credentialId"
+    selected-name="vm.inputSources.credentialName"
     tabs="vm.inputSources.tabs"
     form="vm.inputSources.form"
     on-close="vm.onInputSourceClose"
     on-next="vm.onInputSourceNext"
     on-select="vm.onInputSourceSelect"
     on-tab-select="vm.onInputSourceTabSelect"
-    on-row-click="vm.onInputSourceRowClick"
+    on-item-select="vm.onInputSourceItemSelect"
     on-test="vm.onInputSourceTest"
     results-filter="vm.filterInputSourceCredentialResults"
 />
diff --git a/awx/ui/client/features/credentials/credentials.strings.js b/awx/ui/client/features/credentials/credentials.strings.js
index d740a91d6d..55e19ca152 100644
--- a/awx/ui/client/features/credentials/credentials.strings.js
+++ b/awx/ui/client/features/credentials/credentials.strings.js
@@ -32,6 +32,8 @@ function CredentialsStrings (BaseString) {
         METADATA: t.s('METADATA'),
         NO_MATCH: t.s('No records matched your search.'),
         NO_RECORDS: t.s('No external credentials available.'),
+        SELECTED: t.s('selected'),
+        NONE_SELECTED: t.s('No credential selected'),
     };
 
     ns.add = {
diff --git a/awx/ui/client/features/credentials/input-source-lookup.component.js b/awx/ui/client/features/credentials/input-source-lookup.component.js
index 50f78abe38..6d6d8841de 100644
--- a/awx/ui/client/features/credentials/input-source-lookup.component.js
+++ b/awx/ui/client/features/credentials/input-source-lookup.component.js
@@ -29,9 +29,10 @@ export default {
         onNext: '=',
         onSelect: '=',
         onTabSelect: '=',
-        onRowClick: '=',
+        onItemSelect: '=',
         onTest: '=',
         selectedId: '=',
+        selectedName: '=',
         form: '=',
         resultsFilter: '=',
     },
diff --git a/awx/ui/client/features/credentials/input-source-lookup.partial.html b/awx/ui/client/features/credentials/input-source-lookup.partial.html
index 0f5a0f8e94..844fb5887d 100644
--- a/awx/ui/client/features/credentials/input-source-lookup.partial.html
+++ b/awx/ui/client/features/credentials/input-source-lookup.partial.html
@@ -13,6 +13,24 @@
             {{::vm.strings.get('inputSources.METADATA')}}
         </at-tab>
     </at-tab-group>
+    <div class="InputSourceLookup-selectedItem" ng-show="vm.tabs.credential._active">
+        <div class="InputSourceLookup-selectedItemLabel">
+            {{::vm.strings.get('inputSources.SELECTED')}}
+        </div>
+        <span>
+            <at-tag
+                ng-show="vm.selectedName"
+                tag="vm.selectedName"
+                icon="external"
+            />
+            <div
+                class="InputSourceLookup-selectedItemText"
+                ng-show="!vm.selectedName"
+            >
+                {{::vm.strings.get('inputSources.NONE_SELECTED')}}
+            </div>
+        </span>
+    </div>
     <at-lookup-list
         ng-show="vm.tabs.credential._active"
         resource-name="credential"
@@ -24,8 +42,7 @@
         results-filter="vm.resultsFilter"
         selected-id="vm.selectedId"
         on-ready="vm.onReady"
-        on-select="vm.onSelect"
-        on-row-click="vm.onRowClick"
+        on-item-select="vm.onItemSelect"
     />
     <at-form state="vm.form" autocomplete="off" id="input_source_form">
         <at-input-group
diff --git a/awx/ui/client/lib/components/lookup-list/lookup-list.component.js b/awx/ui/client/lib/components/lookup-list/lookup-list.component.js
index 4a78625414..241fce2b02 100644
--- a/awx/ui/client/lib/components/lookup-list/lookup-list.component.js
+++ b/awx/ui/client/lib/components/lookup-list/lookup-list.component.js
@@ -42,8 +42,7 @@ export default {
     controller: LookupListController,
     controllerAs: 'vm',
     bindings: {
-        onSelect: '=',
-        onRowClick: '=',
+        onItemSelect: '=',
         onReady: '=',
         selectedId: '=',
         resourceName: '@',
diff --git a/awx/ui/client/lib/components/lookup-list/lookup-list.partial.html b/awx/ui/client/lib/components/lookup-list/lookup-list.partial.html
index a2fcee30c1..11167678ee 100644
--- a/awx/ui/client/lib/components/lookup-list/lookup-list.partial.html
+++ b/awx/ui/client/lib/components/lookup-list/lookup-list.partial.html
@@ -63,13 +63,13 @@
                         <input type="radio"
                             name="check_{{ vm.resourceName }}_{{ obj.id }}"
                             ng-checked="obj.id === vm.selectedId"
-                            ng-click="vm.onRowClick(obj)"
+                            ng-click="vm.onItemSelect(obj)"
                         >
                     </div>
                     <div class="d-flex h-100">
                         <div
                             class="List-tableCell name-column col-sm-12"
-                             ng-click="vm.onRowClick(obj)"
+                             ng-click="vm.onItemSelect(obj)"
                         >
                             {{ obj.name }}
                         </div>