diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx
index ea28e52652..a16ff73a38 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.jsx
@@ -25,7 +25,7 @@ function AdHocCommands({ children, apiModule, adHocItems, itemId, i18n }) {
   const {
     error: fetchError,
     request: fetchModuleOptions,
-    result: { moduleOptions, credentialTypeId },
+    result: { moduleOptions, credentialTypeId, isDisabled },
   } = useRequest(
     useCallback(async () => {
       const [choices, credId] = await Promise.all([
@@ -44,13 +44,13 @@ function AdHocCommands({ children, apiModule, adHocItems, itemId, i18n }) {
       const options = choices.data.actions.GET.module_name.choices.map(
         (choice, index) => itemObject(choice[0], index)
       );
-
       return {
         moduleOptions: [itemObject('', -1), ...options],
         credentialTypeId: credId.data.results[0].id,
+        isDisabled: !choices.data.actions.POST,
       };
     }, [itemId, apiModule]),
-    { moduleOptions: [] }
+    { moduleOptions: [], isDisabled: true }
   );
 
   useEffect(() => {
@@ -118,6 +118,7 @@ function AdHocCommands({ children, apiModule, adHocItems, itemId, i18n }) {
     <Fragment>
       {children({
         openAdHocCommands: () => setIsWizardOpen(true),
+        isDisabled,
       })}
 
       {isWizardOpen && (
diff --git a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.test.jsx b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.test.jsx
index b9582daedc..5d54fd1b1f 100644
--- a/awx/ui_next/src/components/AdHocCommands/AdHocCommands.test.jsx
+++ b/awx/ui_next/src/components/AdHocCommands/AdHocCommands.test.jsx
@@ -25,8 +25,12 @@ const adHocItems = [
   { name: 'Inventory 2 Org 0' },
 ];
 
-const children = ({ openAdHocCommands }) => (
-  <button type="submit" onClick={() => openAdHocCommands()} />
+const children = ({ openAdHocCommands, isDisabled }) => (
+  <button
+    type="submit"
+    disabled={isDisabled}
+    onClick={() => openAdHocCommands()}
+  />
 );
 
 describe('<AdHocCommands />', () => {
@@ -344,4 +348,26 @@ describe('<AdHocCommands />', () => {
     wrapper.update();
     expect(wrapper.find('ErrorDetail').length).toBe(1);
   });
+  test('should disable button', async () => {
+    const isDisabled = true;
+    const newChild = ({ openAdHocCommands }) => (
+      <button
+        type="submit"
+        disabled={isDisabled}
+        onClick={() => openAdHocCommands()}
+      />
+    );
+    await act(async () => {
+      wrapper = mountWithContexts(
+        <AdHocCommands
+          apiModule={InventoriesAPI}
+          adHocItems={adHocItems}
+          itemId={1}
+          credentialTypeId={1}
+        >
+          {newChild}
+        </AdHocCommands>
+      );
+    });
+  });
 });
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
index 84203a700e..fcd3ab0bcf 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.jsx
@@ -2,6 +2,12 @@ import React, { useEffect, useCallback, useState } from 'react';
 import { useHistory, useLocation, useParams } from 'react-router-dom';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
+import {
+  Button,
+  Tooltip,
+  DropdownItem,
+  ToolbarItem,
+} from '@patternfly/react-core';
 import { getQSConfig, mergeParams, parseQueryString } from '../../../util/qs';
 import { GroupsAPI, InventoriesAPI } from '../../../api';
 
@@ -16,6 +22,8 @@ import ErrorDetail from '../../../components/ErrorDetail';
 import PaginatedDataList from '../../../components/PaginatedDataList';
 import AssociateModal from '../../../components/AssociateModal';
 import DisassociateButton from '../../../components/DisassociateButton';
+import { Kebabified } from '../../../contexts/Kebabified';
+import AdHocCommandsButton from '../../../components/AdHocCommands/AdHocCommands';
 import InventoryGroupHostListItem from './InventoryGroupHostListItem';
 import AddHostDropdown from './AddHostDropdown';
 
@@ -195,6 +203,55 @@ function InventoryGroupHostList({ i18n }) {
                     />,
                   ]
                 : []),
+              <Kebabified>
+                {({ isKebabified }) =>
+                  isKebabified ? (
+                    <AdHocCommandsButton
+                      adHocItems={selected}
+                      apiModule={InventoriesAPI}
+                      itemId={parseInt(inventoryId, 10)}
+                    >
+                      {({ openAdHocCommands, isDisabled }) => (
+                        <DropdownItem
+                          key="run command"
+                          onClick={openAdHocCommands}
+                          isDisabled={hostCount === 0 || isDisabled}
+                        >
+                          {i18n._(t`Run command`)}
+                        </DropdownItem>
+                      )}
+                    </AdHocCommandsButton>
+                  ) : (
+                    <ToolbarItem>
+                      <Tooltip
+                        content={i18n._(
+                          t`Select an inventory source by clicking the check box beside it. The inventory source can be a single host or a selection of multiple hosts.`
+                        )}
+                        position="top"
+                        key="adhoc"
+                      >
+                        <AdHocCommandsButton
+                          css="margin-right: 20px"
+                          adHocItems={selected}
+                          apiModule={InventoriesAPI}
+                          itemId={parseInt(inventoryId, 10)}
+                        >
+                          {({ openAdHocCommands, isDisabled }) => (
+                            <Button
+                              variant="secondary"
+                              aria-label={i18n._(t`Run command`)}
+                              onClick={openAdHocCommands}
+                              isDisabled={hostCount === 0 || isDisabled}
+                            >
+                              {i18n._(t`Run command`)}
+                            </Button>
+                          )}
+                        </AdHocCommandsButton>
+                      </Tooltip>
+                    </ToolbarItem>
+                  )
+                }
+              </Kebabified>,
               <DisassociateButton
                 key="disassociate"
                 onDisassociate={handleDisassociate}
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.test.jsx
index 04d6a8a46c..a94d039df7 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroupHosts/InventoryGroupHostList.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { createMemoryHistory } from 'history';
-import { GroupsAPI, InventoriesAPI } from '../../../api';
+import { GroupsAPI, InventoriesAPI, CredentialTypesAPI } from '../../../api';
 import {
   mountWithContexts,
   waitForElement,
@@ -11,6 +11,7 @@ import mockHosts from '../shared/data.hosts.json';
 
 jest.mock('../../../api/models/Groups');
 jest.mock('../../../api/models/Inventories');
+jest.mock('../../../api/models/CredentialTypes');
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useParams: () => ({
@@ -95,6 +96,52 @@ describe('<InventoryGroupHostList />', () => {
     });
   });
 
+  test('should render enabled ad hoc commands button', async () => {
+    GroupsAPI.readAllHosts.mockResolvedValue({
+      data: { ...mockHosts },
+    });
+    InventoriesAPI.readHostsOptions.mockResolvedValue({
+      data: {
+        actions: {
+          GET: {},
+          POST: {},
+        },
+      },
+    });
+    InventoriesAPI.readAdHocOptions.mockResolvedValue({
+      data: {
+        actions: {
+          GET: { module_name: { choices: [['module']] } },
+          POST: {},
+        },
+      },
+    });
+    CredentialTypesAPI.read.mockResolvedValue({
+      data: { count: 1, results: [{ id: 1, name: 'cred' }] },
+    });
+    await act(async () => {
+      wrapper = mountWithContexts(
+        <InventoryGroupHostList>
+          {({ openAdHocCommands, isDisabled }) => (
+            <button
+              type="button"
+              variant="secondary"
+              className="run-command"
+              onClick={openAdHocCommands}
+              disabled={isDisabled}
+            />
+          )}
+        </InventoryGroupHostList>
+      );
+    });
+
+    await waitForElement(
+      wrapper,
+      'button[aria-label="Run command"]',
+      el => el.prop('disabled') === false
+    );
+  });
+
   test('should show add dropdown button according to permissions', async () => {
     expect(wrapper.find('AddHostDropdown').length).toBe(1);
     InventoriesAPI.readHostsOptions.mockResolvedValueOnce({
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
index 5c554af363..eef3f2df10 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.jsx
@@ -158,11 +158,11 @@ function InventoryGroupsList({ i18n }) {
           apiModule={InventoriesAPI}
           itemId={parseInt(inventoryId, 10)}
         >
-          {({ openAdHocCommands }) => (
+          {({ openAdHocCommands, isDisabled }) => (
             <DropdownItem
               key="run command"
               onClick={openAdHocCommands}
-              isDisabled={groupCount === 0}
+              isDisabled={groupCount === 0 || isDisabled}
             >
               {i18n._(t`Run command`)}
             </DropdownItem>
@@ -270,12 +270,12 @@ function InventoryGroupsList({ i18n }) {
                               apiModule={InventoriesAPI}
                               itemId={parseInt(inventoryId, 10)}
                             >
-                              {({ openAdHocCommands }) => (
+                              {({ openAdHocCommands, isDisabled }) => (
                                 <Button
                                   variant="secondary"
                                   aria-label={i18n._(t`Run command`)}
                                   onClick={openAdHocCommands}
-                                  isDisabled={groupCount === 0}
+                                  isDisabled={groupCount === 0 || isDisabled}
                                 >
                                   {i18n._(t`Run command`)}
                                 </Button>
diff --git a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx
index 6684a2a01e..800e715e5e 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryGroups/InventoryGroupsList.test.jsx
@@ -6,7 +6,7 @@ import {
   mountWithContexts,
   waitForElement,
 } from '../../../../testUtils/enzymeHelpers';
-import { InventoriesAPI, GroupsAPI } from '../../../api';
+import { InventoriesAPI, GroupsAPI, CredentialTypesAPI } from '../../../api';
 import InventoryGroupsList from './InventoryGroupsList';
 
 jest.mock('../../../api');
@@ -71,13 +71,34 @@ describe('<InventoryGroupsList />', () => {
         },
       },
     });
+    InventoriesAPI.readAdHocOptions.mockResolvedValue({
+      data: {
+        actions: {
+          GET: { module_name: { choices: [['module']] } },
+          POST: {},
+        },
+      },
+    });
+    CredentialTypesAPI.read.mockResolvedValue({
+      data: { count: 1, results: [{ id: 1, name: 'cred' }] },
+    });
     const history = createMemoryHistory({
       initialEntries: ['/inventories/inventory/3/groups'],
     });
     await act(async () => {
       wrapper = mountWithContexts(
         <Route path="/inventories/inventory/:id/groups">
-          <InventoryGroupsList />
+          <InventoryGroupsList>
+            {({ openAdHocCommands, isDisabled }) => (
+              <button
+                type="button"
+                variant="secondary"
+                className="run-command"
+                onClick={openAdHocCommands}
+                disabled={isDisabled}
+              />
+            )}
+          </InventoryGroupsList>
         </Route>,
         {
           context: {
@@ -147,31 +168,17 @@ describe('<InventoryGroupsList />', () => {
       expect(el.props().checked).toBe(false);
     });
   });
+  test('should render enabled ad hoc commands button', async () => {
+    await waitForElement(
+      wrapper,
+      'button[aria-label="Run command"]',
+      el => el.prop('disabled') === false
+    );
+  });
 });
 describe('<InventoryGroupsList/> error handling', () => {
   let wrapper;
-  test('should show content error when api throws error on initial render', async () => {
-    InventoriesAPI.readGroupsOptions.mockImplementationOnce(() =>
-      Promise.reject(new Error())
-    );
-    await act(async () => {
-      wrapper = mountWithContexts(<InventoryGroupsList />);
-    });
-    await waitForElement(wrapper, 'ContentError', el => el.length > 0);
-  });
-
-  test('should show content error if groups are not successfully fetched from api', async () => {
-    InventoriesAPI.readGroups.mockImplementation(() =>
-      Promise.reject(new Error())
-    );
-    await act(async () => {
-      wrapper = mountWithContexts(<InventoryGroupsList />);
-    });
-
-    await waitForElement(wrapper, 'ContentError', el => el.length > 0);
-  });
-
-  test('should show error modal when group is not successfully deleted from api', async () => {
+  beforeEach(() => {
     InventoriesAPI.readGroups.mockResolvedValue({
       data: {
         count: mockGroups.length,
@@ -197,7 +204,42 @@ describe('<InventoryGroupsList/> error handling', () => {
         },
       })
     );
+    InventoriesAPI.readAdHocOptions.mockResolvedValue({
+      data: {
+        actions: {
+          GET: { module_name: { choices: [['module']] } },
+        },
+      },
+    });
+    CredentialTypesAPI.read.mockResolvedValue({
+      data: { count: 1, results: [{ id: 1, name: 'cred' }] },
+    });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+    wrapper.unmount();
+  });
+  test('should show content error when api throws error on initial render', async () => {
+    InventoriesAPI.readGroupsOptions.mockImplementationOnce(() =>
+      Promise.reject(new Error())
+    );
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryGroupsList />);
+    });
+    await waitForElement(wrapper, 'ContentError', el => el.length > 0);
+  });
 
+  test('should show content error if groups are not successfully fetched from api', async () => {
+    InventoriesAPI.readGroups.mockImplementation(() =>
+      Promise.reject(new Error())
+    );
+    await act(async () => {
+      wrapper = mountWithContexts(<InventoryGroupsList />);
+    });
+    await waitForElement(wrapper, 'ContentError', el => el.length > 0);
+  });
+
+  test('should show error modal when group is not successfully deleted from api', async () => {
     const history = createMemoryHistory({
       initialEntries: ['/inventories/inventory/3/groups'],
     });
@@ -249,4 +291,37 @@ describe('<InventoryGroupsList/> error handling', () => {
         .invoke('onClose')();
     });
   });
+  test('should render disabled ad hoc button', async () => {
+    const history = createMemoryHistory({
+      initialEntries: ['/inventories/inventory/3/groups'],
+    });
+
+    await act(async () => {
+      wrapper = mountWithContexts(
+        <Route path="/inventories/inventory/:id/groups">
+          <InventoryGroupsList>
+            {({ openAdHocCommands, isDisabled }) => (
+              <button
+                type="button"
+                variant="secondary"
+                className="run-command"
+                onClick={openAdHocCommands}
+                disabled={isDisabled}
+              />
+            )}
+          </InventoryGroupsList>
+        </Route>,
+        {
+          context: {
+            router: { history, route: { location: history.location } },
+          },
+        }
+      );
+    });
+
+    await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
+    expect(
+      wrapper.find('button[aria-label="Run command"]').prop('disabled')
+    ).toBe(true);
+  });
 });
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
index 609de04f5b..bf53490c83 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.jsx
@@ -2,6 +2,12 @@ import React, { useState, useEffect, useCallback } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
+import {
+  Button,
+  Tooltip,
+  DropdownItem,
+  ToolbarItem,
+} from '@patternfly/react-core';
 import { getQSConfig, parseQueryString, mergeParams } from '../../../util/qs';
 import useRequest, {
   useDismissableError,
@@ -17,6 +23,8 @@ import PaginatedDataList, {
 } from '../../../components/PaginatedDataList';
 import AssociateModal from '../../../components/AssociateModal';
 import DisassociateButton from '../../../components/DisassociateButton';
+import { Kebabified } from '../../../contexts/Kebabified';
+import AdHocCommandsButton from '../../../components/AdHocCommands/AdHocCommands';
 import InventoryHostGroupItem from './InventoryHostGroupItem';
 
 const QS_CONFIG = getQSConfig('group', {
@@ -201,6 +209,55 @@ function InventoryHostGroupsList({ i18n }) {
                     />,
                   ]
                 : []),
+              <Kebabified>
+                {({ isKebabified }) =>
+                  isKebabified ? (
+                    <AdHocCommandsButton
+                      adHocItems={selected}
+                      apiModule={InventoriesAPI}
+                      itemId={parseInt(invId, 10)}
+                    >
+                      {({ openAdHocCommands, isDisabled }) => (
+                        <DropdownItem
+                          key="run command"
+                          onClick={openAdHocCommands}
+                          isDisabled={itemCount === 0 || isDisabled}
+                        >
+                          {i18n._(t`Run command`)}
+                        </DropdownItem>
+                      )}
+                    </AdHocCommandsButton>
+                  ) : (
+                    <ToolbarItem>
+                      <Tooltip
+                        content={i18n._(
+                          t`Select an inventory source by clicking the check box beside it. The inventory source can be a single group or host, a selection of multiple hosts, or a selection of multiple groups.`
+                        )}
+                        position="top"
+                        key="adhoc"
+                      >
+                        <AdHocCommandsButton
+                          css="margin-right: 20px"
+                          adHocItems={selected}
+                          apiModule={InventoriesAPI}
+                          itemId={parseInt(invId, 10)}
+                        >
+                          {({ openAdHocCommands, isDisabled }) => (
+                            <Button
+                              variant="secondary"
+                              aria-label={i18n._(t`Run command`)}
+                              onClick={openAdHocCommands}
+                              isDisabled={itemCount === 0 || isDisabled}
+                            >
+                              {i18n._(t`Run command`)}
+                            </Button>
+                          )}
+                        </AdHocCommandsButton>
+                      </Tooltip>
+                    </ToolbarItem>
+                  )
+                }
+              </Kebabified>,
               <DisassociateButton
                 key="disassociate"
                 onDisassociate={handleDisassociate}
@@ -208,8 +265,8 @@ function InventoryHostGroupsList({ i18n }) {
                 modalTitle={i18n._(t`Disassociate group from host?`)}
                 modalNote={i18n._(t`
                   Note that you may still see the group in the list after
-                  disassociating if the host is also a member of that group’s 
-                  children.  This list shows all groups the host is associated 
+                  disassociating if the host is also a member of that group’s
+                  children.  This list shows all groups the host is associated
                   with directly and indirectly.
                 `)}
               />,
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.test.jsx
index 493e9dc65a..fed065ecb4 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHostGroups/InventoryHostGroupsList.test.jsx
@@ -6,7 +6,7 @@ import {
   mountWithContexts,
   waitForElement,
 } from '../../../../testUtils/enzymeHelpers';
-import { HostsAPI, InventoriesAPI } from '../../../api';
+import { HostsAPI, InventoriesAPI, CredentialTypesAPI } from '../../../api';
 import InventoryHostGroupsList from './InventoryHostGroupsList';
 
 jest.mock('../../../api');
@@ -80,6 +80,17 @@ describe('<InventoryHostGroupsList />', () => {
         },
       },
     });
+    InventoriesAPI.readAdHocOptions.mockResolvedValue({
+      data: {
+        actions: {
+          GET: { module_name: { choices: [['module']] } },
+          POST: {},
+        },
+      },
+    });
+    CredentialTypesAPI.read.mockResolvedValue({
+      data: { count: 1, results: [{ id: 1, name: 'cred' }] },
+    });
     const history = createMemoryHistory({
       initialEntries: ['/inventories/inventory/1/hosts/3/groups'],
     });
@@ -272,4 +283,11 @@ describe('<InventoryHostGroupsList />', () => {
     wrapper.update();
     expect(wrapper.find('AlertModal ErrorDetail').length).toBe(1);
   });
+  test('should render enabled ad hoc commands button', async () => {
+    await waitForElement(
+      wrapper,
+      'button[aria-label="Run command"]',
+      el => el.prop('disabled') === false
+    );
+  });
 });
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
index 6e0168330d..a635aca352 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.jsx
@@ -2,6 +2,12 @@ import React, { useEffect, useState } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
+import {
+  Button,
+  Tooltip,
+  DropdownItem,
+  ToolbarItem,
+} from '@patternfly/react-core';
 import { getQSConfig, parseQueryString } from '../../../util/qs';
 import { InventoriesAPI, HostsAPI } from '../../../api';
 
@@ -12,6 +18,8 @@ import PaginatedDataList, {
   ToolbarAddButton,
   ToolbarDeleteButton,
 } from '../../../components/PaginatedDataList';
+import { Kebabified } from '../../../contexts/Kebabified';
+import AdHocCommandsButton from '../../../components/AdHocCommands/AdHocCommands';
 import InventoryHostItem from './InventoryHostItem';
 
 const QS_CONFIG = getQSConfig('host', {
@@ -149,6 +157,55 @@ function InventoryHostList({ i18n }) {
                     />,
                   ]
                 : []),
+              <Kebabified>
+                {({ isKebabified }) =>
+                  isKebabified ? (
+                    <AdHocCommandsButton
+                      adHocItems={selected}
+                      apiModule={InventoriesAPI}
+                      itemId={parseInt(id, 10)}
+                    >
+                      {({ openAdHocCommands, isDisabled }) => (
+                        <DropdownItem
+                          key="run command"
+                          onClick={openAdHocCommands}
+                          isDisabled={hostCount === 0 || isDisabled}
+                        >
+                          {i18n._(t`Run command`)}
+                        </DropdownItem>
+                      )}
+                    </AdHocCommandsButton>
+                  ) : (
+                    <ToolbarItem>
+                      <Tooltip
+                        content={i18n._(
+                          t`Select an inventory source by clicking the check box beside it. The inventory source can be a single host or a selection of multiple hosts.`
+                        )}
+                        position="top"
+                        key="adhoc"
+                      >
+                        <AdHocCommandsButton
+                          css="margin-right: 20px"
+                          adHocItems={selected}
+                          apiModule={InventoriesAPI}
+                          itemId={parseInt(id, 10)}
+                        >
+                          {({ openAdHocCommands, isDisabled }) => (
+                            <Button
+                              variant="secondary"
+                              aria-label={i18n._(t`Run command`)}
+                              onClick={openAdHocCommands}
+                              isDisabled={hostCount === 0 || isDisabled}
+                            >
+                              {i18n._(t`Run command`)}
+                            </Button>
+                          )}
+                        </AdHocCommandsButton>
+                      </Tooltip>
+                    </ToolbarItem>
+                  )
+                }
+              </Kebabified>,
               <ToolbarDeleteButton
                 key="delete"
                 onDelete={handleDelete}
diff --git a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.test.jsx b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.test.jsx
index 66ba9d992d..85a25f11bb 100644
--- a/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/InventoryHosts/InventoryHostList.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { InventoriesAPI, HostsAPI } from '../../../api';
+import { InventoriesAPI, HostsAPI, CredentialTypesAPI } from '../../../api';
 import {
   mountWithContexts,
   waitForElement,
@@ -93,6 +93,17 @@ describe('<InventoryHostList />', () => {
         },
       },
     });
+    InventoriesAPI.readAdHocOptions.mockResolvedValue({
+      data: {
+        actions: {
+          GET: { module_name: { choices: [['module']] } },
+          POST: {},
+        },
+      },
+    });
+    CredentialTypesAPI.read.mockResolvedValue({
+      data: { count: 1, results: [{ id: 1, name: 'cred' }] },
+    });
     await act(async () => {
       wrapper = mountWithContexts(<InventoryHostList />);
     });
@@ -293,4 +304,11 @@ describe('<InventoryHostList />', () => {
     });
     await waitForElement(wrapper, 'ContentError', el => el.length === 1);
   });
+  test('should render enabled ad hoc commands button', async () => {
+    await waitForElement(
+      wrapper,
+      'button[aria-label="Run command"]',
+      el => el.prop('disabled') === false
+    );
+  });
 });
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.jsx
index aa6290669c..e5539647be 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.jsx
@@ -2,7 +2,12 @@ import React, { useEffect, useCallback } from 'react';
 import { useLocation } from 'react-router-dom';
 import { withI18n } from '@lingui/react';
 import { t } from '@lingui/macro';
-import { Button } from '@patternfly/react-core';
+import {
+  Button,
+  Tooltip,
+  DropdownItem,
+  ToolbarItem,
+} from '@patternfly/react-core';
 import DataListToolbar from '../../../components/DataListToolbar';
 import PaginatedDataList from '../../../components/PaginatedDataList';
 import SmartInventoryHostListItem from './SmartInventoryHostListItem';
@@ -11,6 +16,8 @@ import useSelected from '../../../util/useSelected';
 import { getQSConfig, parseQueryString } from '../../../util/qs';
 import { InventoriesAPI } from '../../../api';
 import { Inventory } from '../../../types';
+import { Kebabified } from '../../../contexts/Kebabified';
+import AdHocCommandsButton from '../../../components/AdHocCommands/AdHocCommands';
 
 const QS_CONFIG = getQSConfig('host', {
   page: 1,
@@ -89,12 +96,55 @@ function SmartInventoryHostList({ i18n, inventory }) {
           additionalControls={
             inventory?.summary_fields?.user_capabilities?.adhoc
               ? [
-                  <Button
-                    aria-label={i18n._(t`Run commands`)}
-                    isDisabled={selected.length === 0}
-                  >
-                    {i18n._(t`Run commands`)}
-                  </Button>,
+                  <Kebabified>
+                    {({ isKebabified }) =>
+                      isKebabified ? (
+                        <AdHocCommandsButton
+                          adHocItems={selected}
+                          apiModule={InventoriesAPI}
+                          itemId={parseInt(inventory.id, 10)}
+                        >
+                          {({ openAdHocCommands, isDisabled }) => (
+                            <DropdownItem
+                              key="run command"
+                              onClick={openAdHocCommands}
+                              isDisabled={count === 0 || isDisabled}
+                            >
+                              {i18n._(t`Run command`)}
+                            </DropdownItem>
+                          )}
+                        </AdHocCommandsButton>
+                      ) : (
+                        <ToolbarItem>
+                          <Tooltip
+                            content={i18n._(
+                              t`Select an inventory source by clicking the check box beside it. The inventory source can be a single host or a selection of multiple hosts.`
+                            )}
+                            position="top"
+                            key="adhoc"
+                          >
+                            <AdHocCommandsButton
+                              css="margin-right: 20px"
+                              adHocItems={selected}
+                              apiModule={InventoriesAPI}
+                              itemId={parseInt(inventory.id, 10)}
+                            >
+                              {({ openAdHocCommands, isDisabled }) => (
+                                <Button
+                                  variant="secondary"
+                                  aria-label={i18n._(t`Run command`)}
+                                  onClick={openAdHocCommands}
+                                  isDisabled={count === 0 || isDisabled}
+                                >
+                                  {i18n._(t`Run command`)}
+                                </Button>
+                              )}
+                            </AdHocCommandsButton>
+                          </Tooltip>
+                        </ToolbarItem>
+                      )
+                    }
+                  </Kebabified>,
                 ]
               : []
           }
diff --git a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.jsx b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.jsx
index ae3f00d66f..a1bb33f221 100644
--- a/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.jsx
+++ b/awx/ui_next/src/screens/Inventory/SmartInventoryHosts/SmartInventoryHostList.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { InventoriesAPI } from '../../../api';
+import { InventoriesAPI, CredentialTypesAPI } from '../../../api';
 import {
   mountWithContexts,
   waitForElement,
@@ -12,125 +12,107 @@ import mockHosts from '../shared/data.hosts.json';
 jest.mock('../../../api');
 
 describe('<SmartInventoryHostList />', () => {
-  describe('User has adhoc permissions', () => {
-    let wrapper;
-    const clonedInventory = {
-      ...mockInventory,
-      summary_fields: {
-        ...mockInventory.summary_fields,
-        user_capabilities: {
-          ...mockInventory.summary_fields.user_capabilities,
+  // describe('User has adhoc permissions', () => {
+  let wrapper;
+  const clonedInventory = {
+    ...mockInventory,
+    summary_fields: {
+      ...mockInventory.summary_fields,
+      user_capabilities: {
+        ...mockInventory.summary_fields.user_capabilities,
+      },
+    },
+  };
+
+  beforeAll(async () => {
+    InventoriesAPI.readHosts.mockResolvedValue({
+      data: mockHosts,
+    });
+    InventoriesAPI.readAdHocOptions.mockResolvedValue({
+      data: {
+        actions: {
+          GET: { module_name: { choices: [['module']] } },
+          POST: {},
         },
       },
-    };
-
-    beforeAll(async () => {
-      InventoriesAPI.readHosts.mockResolvedValue({
-        data: mockHosts,
-      });
-      await act(async () => {
-        wrapper = mountWithContexts(
-          <SmartInventoryHostList inventory={clonedInventory} />
-        );
-      });
-      await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
     });
-
-    afterAll(() => {
-      jest.clearAllMocks();
-      wrapper.unmount();
+    CredentialTypesAPI.read.mockResolvedValue({
+      data: { count: 1, results: [{ id: 1, name: 'cred' }] },
     });
-
-    test('initially renders successfully', () => {
-      expect(wrapper.find('SmartInventoryHostList').length).toBe(1);
-    });
-
-    test('should fetch hosts from api and render them in the list', () => {
-      expect(InventoriesAPI.readHosts).toHaveBeenCalled();
-      expect(wrapper.find('SmartInventoryHostListItem').length).toBe(3);
-    });
-
-    test('should disable run commands button when no hosts are selected', () => {
-      wrapper.find('DataListCheck').forEach(el => {
-        expect(el.props().checked).toBe(false);
-      });
-      const runCommandsButton = wrapper.find(
-        'button[aria-label="Run commands"]'
+    await act(async () => {
+      wrapper = mountWithContexts(
+        <SmartInventoryHostList inventory={clonedInventory}>
+          {({ openAdHocCommands, isDisabled }) => (
+            <button
+              type="button"
+              variant="secondary"
+              className="run-command"
+              onClick={openAdHocCommands}
+              disabled={isDisabled}
+            />
+          )}
+        </SmartInventoryHostList>
       );
-      expect(runCommandsButton.length).toBe(1);
-      expect(runCommandsButton.prop('disabled')).toEqual(true);
     });
+    await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
+  });
 
-    test('should enable run commands button when at least one host is selected', () => {
-      act(() => {
-        wrapper.find('DataListCheck[id="select-host-2"]').invoke('onChange')(
-          true
-        );
-      });
-      wrapper.update();
-      const runCommandsButton = wrapper.find(
-        'button[aria-label="Run commands"]'
-      );
-      expect(runCommandsButton.prop('disabled')).toEqual(false);
+  afterAll(() => {
+    jest.clearAllMocks();
+    wrapper.unmount();
+  });
+
+  test('initially renders successfully', () => {
+    expect(wrapper.find('SmartInventoryHostList').length).toBe(1);
+  });
+
+  test('should fetch hosts from api and render them in the list', () => {
+    expect(InventoriesAPI.readHosts).toHaveBeenCalled();
+    expect(wrapper.find('SmartInventoryHostListItem').length).toBe(3);
+  });
+
+  test('should have run command button', () => {
+    wrapper.find('DataListCheck').forEach(el => {
+      expect(el.props().checked).toBe(false);
     });
+    const runCommandsButton = wrapper.find('button[aria-label="Run command"]');
+    expect(runCommandsButton.length).toBe(1);
+  });
 
-    test('should select and deselect all items', async () => {
-      act(() => {
-        wrapper.find('DataListToolbar').invoke('onSelectAll')(true);
-      });
-      wrapper.update();
-      wrapper.find('DataListCheck').forEach(el => {
-        expect(el.props().checked).toEqual(true);
-      });
-      act(() => {
-        wrapper.find('DataListToolbar').invoke('onSelectAll')(false);
-      });
-      wrapper.update();
-      wrapper.find('DataListCheck').forEach(el => {
-        expect(el.props().checked).toEqual(false);
-      });
+  test('should select and deselect all items', async () => {
+    act(() => {
+      wrapper.find('DataListToolbar').invoke('onSelectAll')(true);
     });
-
-    test('should show content error when api throws an error', async () => {
-      InventoriesAPI.readHosts.mockImplementation(() =>
-        Promise.reject(new Error())
-      );
-      await act(async () => {
-        wrapper = mountWithContexts(
-          <SmartInventoryHostList inventory={mockInventory} />
-        );
-      });
-      await waitForElement(wrapper, 'ContentError', el => el.length === 1);
+    wrapper.update();
+    wrapper.find('DataListCheck').forEach(el => {
+      expect(el.props().checked).toEqual(true);
+    });
+    act(() => {
+      wrapper.find('DataListToolbar').invoke('onSelectAll')(false);
+    });
+    wrapper.update();
+    wrapper.find('DataListCheck').forEach(el => {
+      expect(el.props().checked).toEqual(false);
     });
   });
 
-  describe('User does not have adhoc permissions', () => {
-    let wrapper;
-    const clonedInventory = {
-      ...mockInventory,
-      summary_fields: {
-        user_capabilities: {
-          adhoc: false,
-        },
-      },
-    };
+  test('should render enabled ad hoc commands button', async () => {
+    await waitForElement(
+      wrapper,
+      'button[aria-label="Run command"]',
+      el => el.prop('disabled') === false
+    );
+  });
 
-    test('should hide run commands button', async () => {
-      InventoriesAPI.readHosts.mockResolvedValue({
-        data: { results: [], count: 0 },
-      });
-      await act(async () => {
-        wrapper = mountWithContexts(
-          <SmartInventoryHostList inventory={clonedInventory} />
-        );
-      });
-      await waitForElement(wrapper, 'ContentLoading', el => el.length === 0);
-      const runCommandsButton = wrapper.find(
-        'button[aria-label="Run commands"]'
+  test('should show content error when api throws an error', async () => {
+    InventoriesAPI.readHosts.mockImplementation(() =>
+      Promise.reject(new Error())
+    );
+    await act(async () => {
+      wrapper = mountWithContexts(
+        <SmartInventoryHostList inventory={mockInventory} />
       );
-      expect(runCommandsButton.length).toBe(0);
-      jest.clearAllMocks();
-      wrapper.unmount();
     });
+    await waitForElement(wrapper, 'ContentError', el => el.length === 1);
   });
 });