diff --git a/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx b/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx
index 7489b707a8..d74e08b823 100644
--- a/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx
+++ b/awx/ui_next/src/components/AddRole/SelectResourceStep.jsx
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import { withRouter, useLocation } from 'react-router-dom';
 import { t } from '@lingui/macro';
 import useRequest from '../../util/useRequest';
-
 import { SearchColumns, SortColumns } from '../../types';
 import DataListToolbar from '../DataListToolbar';
 import CheckboxListItem from '../CheckboxListItem';
diff --git a/awx/ui_next/src/components/CheckboxListItem/CheckboxListItem.jsx b/awx/ui_next/src/components/CheckboxListItem/CheckboxListItem.jsx
index c76a542ea2..1467293026 100644
--- a/awx/ui_next/src/components/CheckboxListItem/CheckboxListItem.jsx
+++ b/awx/ui_next/src/components/CheckboxListItem/CheckboxListItem.jsx
@@ -4,7 +4,6 @@ import { t } from '@lingui/macro';
 import { Td, Tr } from '@patternfly/react-table';
 
 const CheckboxListItem = ({
-  isDisabled = false,
   isRadio = false,
   isSelected = false,
   itemId,
@@ -16,15 +15,26 @@ const CheckboxListItem = ({
   columns,
   item,
 }) => {
+  const handleRowClick = () => {
+    if (isSelected && !isRadio) {
+      onDeselect(itemId);
+    } else {
+      onSelect(itemId);
+    }
+  };
+
   return (
-    <Tr ouiaId={`list-item-${itemId}`} id={`list-item-${itemId}`}>
+    <Tr
+      ouiaId={`list-item-${itemId}`}
+      id={`list-item-${itemId}`}
+      onClick={handleRowClick}
+    >
       <Td
         id={`check-action-item-${itemId}`}
         select={{
           rowIndex,
           isSelected,
           onSelect: isSelected ? onDeselect : onSelect,
-          disable: isDisabled,
           variant: isRadio ? 'radio' : 'checkbox',
         }}
         name={name}
diff --git a/awx/ui_next/src/components/OptionsList/OptionsList.jsx b/awx/ui_next/src/components/OptionsList/OptionsList.jsx
index ccd6fd8ff9..5585f7c413 100644
--- a/awx/ui_next/src/components/OptionsList/OptionsList.jsx
+++ b/awx/ui_next/src/components/OptionsList/OptionsList.jsx
@@ -9,7 +9,6 @@ import {
   oneOfType,
 } from 'prop-types';
 import styled from 'styled-components';
-
 import { t } from '@lingui/macro';
 import SelectedList from '../SelectedList';
 import CheckboxListItem from '../CheckboxListItem';
@@ -41,7 +40,6 @@ function OptionsList({
   deselectItem,
   renderItemChip,
   isLoading,
-
   displayKey,
 }) {
   return (