diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index bb0ba232..467a9a14 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -216,7 +216,7 @@ export default function Table({
   return (
     <Suspense fallback={<Loading message="Loading fields" />}>
       {/* <Hotkeys selectedCell={selectedCell} /> */}
-      <TableContainer rowHeight={rowHeight}>
+      <TableContainer rowHeight={rowHeight} className="table-container">
         <DndProvider backend={HTML5Backend}>
           {showLeftScrollDivider && <div className="left-scroll-divider" />}
 
diff --git a/src/pages/Table/ProvidedSubTablePage.tsx b/src/pages/Table/ProvidedSubTablePage.tsx
index c4b505df..8b5af2b3 100644
--- a/src/pages/Table/ProvidedSubTablePage.tsx
+++ b/src/pages/Table/ProvidedSubTablePage.tsx
@@ -23,6 +23,7 @@ import {
 } from "@src/atoms/tableScope";
 import { ROUTES } from "@src/constants/routes";
 import { APP_BAR_HEIGHT } from "@src/layouts/Navigation";
+import { TABLE_TOOLBAR_HEIGHT } from "@src/components/TableToolbar";
 
 /**
  * Wraps `TablePage` with the data for a top-level table.
@@ -98,6 +99,9 @@ export default function ProvidedSubTablePage() {
           },
           "& .dialog-close": { m: (APP_BAR_HEIGHT - 40) / 2 / 8, ml: -1 },
         },
+        "& .table-container": {
+          height: `calc(100vh - ${APP_BAR_HEIGHT}px - ${TABLE_TOOLBAR_HEIGHT}px - 16px)`,
+        },
       }}
       ScrollableDialogContentProps={{
         disableTopDivider: true,