diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
index 292ee519b..d0b3237ab 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
@@ -12,13 +12,13 @@
         Pagination
     } from '$lib/components';
     import {
-        Table,
         TableHeader,
         TableBody,
         TableRow,
         TableCellHead,
         TableCell,
-        TableCellText
+        TableCellText,
+        TableScroll
     } from '$lib/elements/table';
     import { execute, func } from '../store';
     import { Container } from '$lib/layout';
@@ -156,7 +156,7 @@
             <Heading tag="h3" size="7">Inactive</Heading>
         </div>
         {#if data.deployments.total > 1}
-            <Table>
+            <TableScroll>
                 <TableHeader>
                     <TableCellHead width={90}>Deployment ID</TableCellHead>
                     <TableCellHead width={140}>Created</TableCellHead>
@@ -246,7 +246,7 @@
                         {/if}
                     {/each}
                 </TableBody>
-            </Table>
+            </TableScroll>
         {:else}
             <Empty single target="deployment" on:click={() => (showCreate = true)}>
                 <div class="u-text-center">
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte
index 6c0ba8502..fc7a8be27 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte
@@ -3,13 +3,13 @@
     import { Pill } from '$lib/elements';
     import { Copy, Status, Heading, Pagination, EmptySearch } from '$lib/components';
     import {
-        Table,
         TableHeader,
         TableBody,
         TableCellHead,
         TableCell,
         TableCellText,
-        TableRow
+        TableRow,
+        TableScroll
     } from '$lib/elements/table';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { calculateTime } from '$lib/helpers/timeConversion';
@@ -49,7 +49,7 @@
         <Heading tag="h2" size="5">Logs</Heading>
     </div>
     {#if data.executions.total}
-        <Table>
+        <TableScroll>
             <TableHeader>
                 <TableCellHead width={90}>Execution ID</TableCellHead>
                 <TableCellHead width={140}>Created</TableCellHead>
@@ -98,7 +98,7 @@
                     </TableRow>
                 {/each}
             </TableBody>
-        </Table>
+        </TableScroll>
         <div class="u-flex u-margin-block-start-32 u-main-space-between">
             <p class="text">Total results: {data.executions.total}</p>
             <Pagination