diff --git a/libs/ui-lib/lib/common/components/hosts/AITable.tsx b/libs/ui-lib/lib/common/components/hosts/AITable.tsx
index d40f2748fd..c22198e3a3 100644
--- a/libs/ui-lib/lib/common/components/hosts/AITable.tsx
+++ b/libs/ui-lib/lib/common/components/hosts/AITable.tsx
@@ -35,6 +35,7 @@ type TableMemoProps = {
   variant?: TableProps['variant'];
   // eslint-disable-next-line
   actionResolver?: ActionsResolver<any>;
+  skipScroll?: boolean;
 };
 const TableMemo: React.FC<WithTestID & TableMemoProps> = React.memo(
   ({
@@ -48,6 +49,7 @@ const TableMemo: React.FC<WithTestID & TableMemoProps> = React.memo(
     testId,
     variant,
     actionResolver,
+    skipScroll,
   }) => {
     const tableActionResolver = React.useCallback(
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
@@ -58,28 +60,27 @@ const TableMemo: React.FC<WithTestID & TableMemoProps> = React.memo(
     const newProps = {
       canCollapseAll: false,
     };
-    return (
-      <InnerScrollContainer>
-        <Table
-          rows={rows}
-          cells={cells}
-          onCollapse={onCollapse}
-          aria-label="Hosts table"
-          className={classnames(className, 'hosts-table')}
-          sortBy={sortBy}
-          onSort={onSort}
-          rowWrapper={rowWrapper}
-          data-testid={testId}
-          actionResolver={actionResolver ? tableActionResolver : undefined}
-          variant={variant}
-          actionsMenuAppendTo={() => document.body}
-          {...newProps}
-        >
-          <TableHeader />
-          <TableBody rowKey={rowKey} />
-        </Table>
-      </InnerScrollContainer>
+    const tableElement = (
+      <Table
+        rows={rows}
+        cells={cells}
+        onCollapse={onCollapse}
+        aria-label="Hosts table"
+        className={classnames(className, 'hosts-table')}
+        sortBy={sortBy}
+        onSort={onSort}
+        rowWrapper={rowWrapper}
+        data-testid={testId}
+        actionResolver={actionResolver ? tableActionResolver : undefined}
+        variant={variant}
+        actionsMenuAppendTo={() => document.body}
+        {...newProps}
+      >
+        <TableHeader />
+        <TableBody rowKey={rowKey} />
+      </Table>
     );
+    return skipScroll ? tableElement : <InnerScrollContainer>{tableElement}</InnerScrollContainer>;
   },
 );
 TableMemo.displayName = 'tableMemo';
@@ -155,6 +156,7 @@ export type AITableProps<R> = ReturnType<typeof usePagination> & {
   actionResolver?: ActionsResolver<R>;
   canSelectAll?: boolean;
   variant?: TableProps['variant'];
+  skipScroll?: boolean;
 };
 // eslint-disable-next-line
 const AITable = <R extends any>({
@@ -177,6 +179,7 @@ const AITable = <R extends any>({
   perPageOptions,
   canSelectAll,
   variant,
+  skipScroll,
 }: WithTestID & AITableProps<R>) => {
   const itemIDs = React.useMemo(() => data.map(getDataId), [data, getDataId]);
   React.useEffect(() => {
@@ -331,6 +334,7 @@ const AITable = <R extends any>({
           data-testid={testId}
           actionResolver={actionResolver}
           variant={variant}
+          skipScroll={skipScroll}
         />
       </SelectionProvider.Provider>
       {showPagination && (
diff --git a/libs/ui-lib/lib/common/components/hosts/HostsTable.tsx b/libs/ui-lib/lib/common/components/hosts/HostsTable.tsx
index e0900b9bc4..1266b3ce3a 100644
--- a/libs/ui-lib/lib/common/components/hosts/HostsTable.tsx
+++ b/libs/ui-lib/lib/common/components/hosts/HostsTable.tsx
@@ -62,6 +62,7 @@ type HostsTableProps = ReturnType<typeof usePagination> &
     hosts: Host[];
     skipDisabled?: boolean;
     children: React.ReactNode;
+    skipScroll?: boolean;
   };
 
 const HostsTable = ({ hosts, skipDisabled, ...rest }: HostsTableProps & WithTestID) => {
diff --git a/libs/ui-lib/lib/ocm/components/AddHosts/InventoryAddHost.tsx b/libs/ui-lib/lib/ocm/components/AddHosts/InventoryAddHost.tsx
index 7d1146ea7a..c23c4b7cfc 100644
--- a/libs/ui-lib/lib/ocm/components/AddHosts/InventoryAddHost.tsx
+++ b/libs/ui-lib/lib/ocm/components/AddHosts/InventoryAddHost.tsx
@@ -40,7 +40,7 @@ const InventoryAddHosts = ({ cluster }: { cluster?: Cluster }) => {
         </StackItem>
       )}
       <StackItem>
-        <ClusterHostsTable cluster={cluster} />
+        <ClusterHostsTable cluster={cluster} skipScroll />
       </StackItem>
     </Stack>
   );
diff --git a/libs/ui-lib/lib/ocm/components/hosts/ClusterHostsTable.tsx b/libs/ui-lib/lib/ocm/components/hosts/ClusterHostsTable.tsx
index 3a6023e480..f43752a8f5 100644
--- a/libs/ui-lib/lib/ocm/components/hosts/ClusterHostsTable.tsx
+++ b/libs/ui-lib/lib/ocm/components/hosts/ClusterHostsTable.tsx
@@ -43,9 +43,10 @@ export function ExpandComponent({ obj: host }: ExpandComponentProps<Host>) {
 export interface ClusterHostsTableProps {
   cluster: Cluster;
   skipDisabled?: boolean;
+  skipScroll?: boolean;
 }
 
-const ClusterHostsTable = ({ cluster, skipDisabled }: ClusterHostsTableProps) => {
+const ClusterHostsTable = ({ cluster, skipDisabled, skipScroll }: ClusterHostsTableProps) => {
   const { wizardPerPage, setWizardPerPage } = React.useContext(ClusterWizardContext) || {};
   const {
     onEditHost,
@@ -99,6 +100,7 @@ const ClusterHostsTable = ({ cluster, skipDisabled }: ClusterHostsTableProps) =>
           content={content}
           actionResolver={actionResolver}
           variant={TableVariant.compact}
+          skipScroll={skipScroll}
           {...paginationProps}
         >
           <HostsTableEmptyState isSingleNode={isSNO(cluster)} />