diff --git a/awx/ui/client/src/shared/lookup/lookup-modal.directive.js b/awx/ui/client/src/shared/lookup/lookup-modal.directive.js
index 978a09971b..a15d5b7d2b 100644
--- a/awx/ui/client/src/shared/lookup/lookup-modal.directive.js
+++ b/awx/ui/client/src/shared/lookup/lookup-modal.directive.js
@@ -29,10 +29,8 @@ export default ['templateUrl', function(templateUrl) {
             $scope.init = function() {
                 let list = $scope.list;
                 if($state.params.selected) {
-                    $scope.currentSelection = {
-                        name: null,
-                        id: parseInt($state.params.selected)
-                    };
+                    let selection = $scope[list.name].find(({id}) => id === parseInt($state.params.selected));
+                    $scope.currentSelection = _.pick(selection, 'id', 'name');
                 }
                 $scope.$watch(list.name, function(){
                     selectRowIfPresent();