diff --git a/packages/gitbook/src/components/DocumentView/Table/Table.tsx b/packages/gitbook/src/components/DocumentView/Table/Table.tsx
index b6e84951f..bd56015d7 100644
--- a/packages/gitbook/src/components/DocumentView/Table/Table.tsx
+++ b/packages/gitbook/src/components/DocumentView/Table/Table.tsx
@@ -8,7 +8,7 @@ import { isBlockOffscreen } from '../utils';
 import { StickyViewGrid } from './StickyViewGrid';
 import { ViewCards } from './ViewCards';
 import { ViewGrid, ViewGridHeader } from './ViewGrid';
-import { hasVisibleHeader } from './layout';
+import { getViewGridLayout, hasVisibleHeader } from './layout';
 
 export type TableRecordKV = [string, DocumentTableRecord];
 
@@ -43,6 +43,13 @@ export function Table(props: BlockProps<DocumentBlockTable>) {
                 isOffscreen,
                 records,
             };
+            const { tableWidth } = getViewGridLayout({
+                block,
+                view: block.data.view,
+                mode: context.mode,
+            });
+            const tableContainerClassName =
+                tableWidth === 'w-full' ? 'min-w-full w-fit' : tableWidth;
             const withHeader = hasVisibleHeader(block, block.data.view);
             const withStickyHeader =
                 withHeader && context.mode !== 'print' && block.data.view.stickyHeader === true;
@@ -51,6 +58,7 @@ export function Table(props: BlockProps<DocumentBlockTable>) {
                 return (
                     <StickyViewGrid
                         className={tcls(style, 'relative mx-auto grid w-full min-w-0')}
+                        tableClassName={tableContainerClassName}
                         header={
                             <ViewGridHeader
                                 {...gridProps}
@@ -77,9 +85,14 @@ export function Table(props: BlockProps<DocumentBlockTable>) {
                             'w-full min-w-0 overflow-x-auto overflow-y-hidden overscroll-x-none border-tint-subtle '
                         )}
                     >
-                        <div className={tcls('flex', 'flex-col', 'w-fit')}>
-                            {withHeader ? <ViewGridHeader {...gridProps} /> : null}
-                            <ViewGrid {...gridProps} />
+                        <div className={tcls('flex', 'flex-col', tableContainerClassName)}>
+                            {withHeader ? (
+                                <ViewGridHeader
+                                    {...gridProps}
+                                    className={tableContainerClassName}
+                                />
+                            ) : null}
+                            <ViewGrid {...gridProps} tableClassName={tableContainerClassName} />
                         </div>
                     </div>
                 </div>
diff --git a/packages/gitbook/src/components/DocumentView/Table/ViewGrid.tsx b/packages/gitbook/src/components/DocumentView/Table/ViewGrid.tsx
index 7ba3620b7..2393acfff 100644
--- a/packages/gitbook/src/components/DocumentView/Table/ViewGrid.tsx
+++ b/packages/gitbook/src/components/DocumentView/Table/ViewGrid.tsx
@@ -11,6 +11,10 @@ interface ViewGridHeaderProps extends TableViewProps<DocumentTableViewGrid> {
     className?: string;
 }
 
+interface ViewGridProps extends TableViewProps<DocumentTableViewGrid> {
+    tableClassName?: string;
+}
+
 export function ViewGridHeader(props: ViewGridHeaderProps) {
     const { block, view, context, className } = props;
     const { tableWidth, columnWidths, autoSizedColumns, fixedColumns } = getViewGridLayout({
@@ -63,8 +67,8 @@ export function ViewGridHeader(props: ViewGridHeaderProps) {
     );
 }
 
-export function ViewGrid(props: TableViewProps<DocumentTableViewGrid>) {
-    const { block, view, records, context } = props;
+export function ViewGrid(props: ViewGridProps) {
+    const { block, view, records, context, tableClassName } = props;
     const { tableWidth, autoSizedColumns, fixedColumns } = getViewGridLayout({
         block,
         view,
@@ -86,7 +90,7 @@ export function ViewGrid(props: TableViewProps<DocumentTableViewGrid>) {
     );
 
     return (
-        <div role="table" className={tcls('flex', 'flex-col', 'w-fit')}>
+        <div role="table" className={tcls('flex', 'flex-col', tableClassName ?? 'w-fit')}>
             {body}
         </div>
     );