diff --git a/packages/react-table/src/demos/Table.md b/packages/react-table/src/demos/Table.md
index 341692f5dd5..a8abdc31075 100644
--- a/packages/react-table/src/demos/Table.md
+++ b/packages/react-table/src/demos/Table.md
@@ -3,7 +3,7 @@ id: Table
 section: components
 ---
 
-import { Checkbox, ToolbarExpandIconWrapper, ToolbarContent } from '@patternfly/react-core';
+import { Checkbox, PageSection, ToolbarExpandIconWrapper, ToolbarContent } from '@patternfly/react-core';
 import CodeIcon from '@patternfly/react-icons/dist/esm/icons/code-icon';
 import CodeBranchIcon from '@patternfly/react-icons/dist/esm/icons/code-branch-icon';
 import CubeIcon from '@patternfly/react-icons/dist/esm/icons/cube-icon';
@@ -21,6 +21,7 @@ import AngleDownIcon from '@patternfly/react-icons/dist/esm/icons/angle-down-ico
 import AngleRightIcon from '@patternfly/react-icons/dist/esm/icons/angle-right-icon';
 import BarsIcon from '@patternfly/react-icons/dist/esm/icons/bars-icon';
 import AttentionBellIcon from '@patternfly/react-icons/dist/esm/icons/attention-bell-icon';
+import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 ### Bulk select
 
@@ -265,7 +266,7 @@ class BulkSelectTableDemo extends React.Component {
 
 ### Expand/collapse all
 
-```js file="table-demos/ExpandCollapseAll.jsx"
+```js isFullscreen file="table-demos/ExpandCollapseAll.jsx"
 ```
 
 ### Column management
@@ -3034,7 +3035,7 @@ class LoadingStateDemo extends React.Component {
             props: { colSpan: 8 },
             title: (
               <Bullseye>
-                <Spinner size="xl" aria-labelledby="loading-table-demo"/>
+                <Spinner size="xl" aria-labelledby="loading-table-demo" />
               </Bullseye>
             )
           }
diff --git a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
index 8880743b512..acb93f677e9 100644
--- a/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
+++ b/packages/react-table/src/demos/table-demos/ExpandCollapseAll.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import { Table, TableHeader, TableBody, expandable } from '@patternfly/react-table';
+import { Card, PageSection, Table, TableHeader, TableBody, expandable } from '@patternfly/react-table';
+import DashboardWrapper from '@patternfly/react-core/src/demos/examples/DashboardWrapper';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 class ExpandCollapseAllTableDemo extends React.Component {
@@ -13,7 +14,7 @@ class ExpandCollapseAllTableDemo extends React.Component {
       collapseAllAriaLabel: 'Expand all',
       columns: [
         {
-          title: 'Header cell1',
+          title: 'Repositories',
           cellFormatters: [expandable]
         },
         'Branches',
@@ -120,19 +121,30 @@ class ExpandCollapseAllTableDemo extends React.Component {
 
     return (
       <React.Fragment>
-        <Table
-          aria-label="Collapsible table"
-          onSelect={this.onSelect}
-          onCollapse={this.onCollapse}
-          rows={rows}
-          cells={columns}
-          canSelectAll={true}
-          canCollapseAll={true}
-          collapseAllAriaLabel={collapseAllAriaLabel}
-        >
-          <TableHeader />
-          <TableBody />
-        </Table>
+        <DashboardWrapper hasPageTemplateTitle>
+          <PageSection
+            padding={{
+              default: 'noPadding',
+              xl: 'padding'
+            }}
+          >
+            <Card component="div">
+              <Table
+                aria-label="Collapsible table"
+                onSelect={this.onSelect}
+                onCollapse={this.onCollapse}
+                rows={rows}
+                cells={columns}
+                canSelectAll={false}
+                canCollapseAll={true}
+                collapseAllAriaLabel={collapseAllAriaLabel}
+              >
+                <TableHeader />
+                <TableBody />
+              </Table>
+            </Card>
+          </PageSection>
+        </DashboardWrapper>
       </React.Fragment>
     );
   }