diff --git a/awx/ui/client/src/inventories-hosts/inventories/main.js b/awx/ui/client/src/inventories-hosts/inventories/main.js
index 66ff152d23..7e2f7f03cf 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/main.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/main.js
@@ -252,7 +252,6 @@ angular.module('inventory', [
 
                 let addSourceCredential = _.cloneDeep(inventorySourcesCredentialRoute);
                 addSourceCredential.name = 'inventories.edit.inventory_sources.add.credential';
-                addSourceCredential.url = '/credential';
 
                 let addSourceInventoryScript = _.cloneDeep(inventorySourcesInventoryScriptRoute);
                 addSourceInventoryScript.name = 'inventories.edit.inventory_sources.add.inventory_script';
@@ -260,7 +259,6 @@ angular.module('inventory', [
 
                 let editSourceCredential = _.cloneDeep(inventorySourcesCredentialRoute);
                 editSourceCredential.name = 'inventories.edit.inventory_sources.edit.credential';
-                editSourceCredential.url = '/credential';
 
                 let addSourceProject = _.cloneDeep(inventorySourcesProjectRoute);
                 addSourceProject.name = 'inventories.edit.inventory_sources.add.project';
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-credential.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-credential.route.js
index b80e65c1c9..b997e07b81 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-credential.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-credential.route.js
@@ -36,8 +36,11 @@ export default {
         ListDefinition: ['CredentialList', function(list) {
             return list;
         }],
-        Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath',
-            (list, qs, $stateParams, GetBasePath) => {
+        Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$transition$',
+            (list, qs, $stateParams, GetBasePath, $transition$) => {
+                let toState = $transition$.to();
+                toState.params.credential_search.value.kind = _.get($stateParams, 'credential_search.kind', null);
+                toState.params.credential_search.value.credential_type__kind = _.get($stateParams, 'credential_search.credential_type__kind', null);
                 return qs.search(GetBasePath('credentials'), $stateParams[`${list.iterator}_search`]);
             }
         ]