diff --git a/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js
index 207395406f..edb09778bd 100644
--- a/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js
+++ b/awx/ui/client/src/inventories-hosts/shared/associate-groups/associate-groups.controller.js
@@ -33,7 +33,7 @@
              list.iterator = 'associate_group';
              list.name = 'associate_groups';
              list.multiSelect = true;
-             list.fields.name.ngClick = 'linkoutGroup(associate_group.id)';
+             list.fields.name.ngClick = 'linkoutGroup(associate_group)';
              list.trackBy = 'associate_group.id';
              list.multiSelectPreview = {
                  selectedRows: 'selectedItems',
@@ -107,10 +107,8 @@
 
          };
 
-         $scope.linkoutGroup = function(userId) {
-             // Open the edit user form in a new tab so as not to navigate the user
-             // away from the modal
-             $window.open('/#/users/' + userId,'_blank');
+         $scope.linkoutGroup = function(group) {
+             $window.open('/#/inventories/inventory/' + group.inventory + '/groups/edit/' + group.id,'_blank');
          };
      });
  }];
diff --git a/awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.controller.js b/awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.controller.js
index dd95b2c4c2..785a8cc12e 100644
--- a/awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.controller.js
+++ b/awx/ui/client/src/inventories-hosts/shared/associate-hosts/associate-hosts.controller.js
@@ -28,7 +28,7 @@
              list.iterator = 'associate_host';
              list.name = 'associate_hosts';
              list.multiSelect = true;
-             list.fields.name.ngClick = 'linkoutHost(associate_host.id)';
+             list.fields.name.ngClick = 'linkoutHost(associate_host)';
              list.trackBy = 'associate_host.id';
              delete list.fields.toggleHost;
              delete list.fields.active_failures;
@@ -98,10 +98,8 @@
 
          };
 
-         $scope.linkoutHost = function(userId) {
-             // Open the edit user form in a new tab so as not to navigate the user
-             // away from the modal
-             $window.open('/#/users/' + userId,'_blank');
+         $scope.linkoutHost = function(host) {
+             $window.open('/#/inventories/inventory/' + host.inventory + '/hosts/edit/' + host.id,'_blank');
          };
      });
  }];