diff --git a/awx/ui/client/features/credentials/legacy.credentials.js b/awx/ui/client/features/credentials/legacy.credentials.js
index b6cb9ffa51..2b04c7b24a 100644
--- a/awx/ui/client/features/credentials/legacy.credentials.js
+++ b/awx/ui/client/features/credentials/legacy.credentials.js
@@ -33,6 +33,7 @@ function LegacyCredentialsService (pathService) {
             Dataset: ['CredentialList', 'QuerySet', '$stateParams', 'GetBasePath',
                 function(list, qs, $stateParams, GetBasePath) {
                     let path = GetBasePath(list.basePath) || GetBasePath(list.name);
+
                     return qs.search(path, $stateParams[`${list.iterator}_search`]);
                 }
             ],
diff --git a/awx/ui/client/src/shared/stateDefinitions.factory.js b/awx/ui/client/src/shared/stateDefinitions.factory.js
index e4af7aeb51..b473e17426 100644
--- a/awx/ui/client/src/shared/stateDefinitions.factory.js
+++ b/awx/ui/client/src/shared/stateDefinitions.factory.js
@@ -738,8 +738,9 @@ function($injector, $stateExtender, $log, i18n) {
                     },
                     resolve: {
                         ListDefinition: [field.list, function(list) {
-                            list.iterator = field.sourceModel;
-                            return list;
+                            let listClone = _.cloneDeep(list);
+                            listClone.iterator = field.sourceModel;
+                            return listClone;
                         }],
                         OrganizationId: ['ListDefinition', 'InventoriesService', '$stateParams', '$rootScope',
                             function(list, InventoriesService, $stateParams, $rootScope){