diff --git a/src/frontend/src/pages/company/CompanyDetail.tsx b/src/frontend/src/pages/company/CompanyDetail.tsx
index 65b08a8eef..afcc08e6c6 100644
--- a/src/frontend/src/pages/company/CompanyDetail.tsx
+++ b/src/frontend/src/pages/company/CompanyDetail.tsx
@@ -1,5 +1,5 @@
 import { t } from '@lingui/macro';
-import { LoadingOverlay, Stack } from '@mantine/core';
+import { LoadingOverlay, Skeleton, Stack } from '@mantine/core';
 import {
   IconBuildingFactory2,
   IconBuildingWarehouse,
@@ -133,7 +133,12 @@ export default function CompanyDetail(props: CompanyDetailProps) {
         name: 'assigned-stock',
         label: t`Assigned Stock`,
         icon: <IconPackageExport />,
-        hidden: !company?.is_customer
+        hidden: !company?.is_customer,
+        content: company?.pk ? (
+          <StockItemTable params={{ customer: company.pk }} />
+        ) : (
+          <Skeleton />
+        )
       },
       {
         name: 'contacts',
diff --git a/src/frontend/src/pages/sales/SalesOrderDetail.tsx b/src/frontend/src/pages/sales/SalesOrderDetail.tsx
index edcc3d3ad0..867f915532 100644
--- a/src/frontend/src/pages/sales/SalesOrderDetail.tsx
+++ b/src/frontend/src/pages/sales/SalesOrderDetail.tsx
@@ -1,5 +1,5 @@
 import { t } from '@lingui/macro';
-import { LoadingOverlay, Stack } from '@mantine/core';
+import { LoadingOverlay, Skeleton, Stack } from '@mantine/core';
 import {
   IconInfoCircle,
   IconList,
@@ -14,6 +14,7 @@ import { useParams } from 'react-router-dom';
 
 import { PageDetail } from '../../components/nav/PageDetail';
 import { PanelGroup, PanelType } from '../../components/nav/PanelGroup';
+import { BuildOrderTable } from '../../components/tables/build/BuildOrderTable';
 import { AttachmentTable } from '../../components/tables/general/AttachmentTable';
 import { NotesEditor } from '../../components/widgets/MarkdownEditor';
 import { ApiPaths } from '../../enums/ApiEndpoints';
@@ -59,7 +60,16 @@ export default function SalesOrderDetail() {
       {
         name: 'build-orders',
         label: t`Build Orders`,
-        icon: <IconTools />
+        icon: <IconTools />,
+        content: order?.pk ? (
+          <BuildOrderTable
+            params={{
+              sales_order: order.pk
+            }}
+          />
+        ) : (
+          <Skeleton />
+        )
       },
       {
         name: 'attachments',