diff --git a/src/components/elements/Table/Table.tsx b/src/components/elements/Table/Table.tsx
index 2c7ad9b2d..78becf5e2 100644
--- a/src/components/elements/Table/Table.tsx
+++ b/src/components/elements/Table/Table.tsx
@@ -186,6 +186,7 @@ function Table<TData extends RowData>({
                           }
                         >
                           <div
+                            className="inline w-full max-w-full"
                             style={{
                               fontSize: "inherit",
                               fontWeight: "inherit",
@@ -193,10 +194,10 @@ function Table<TData extends RowData>({
                               fontFamily: "inherit"
                             }}
                           >
-                            <span
-                              className="font-inherit relative"
+                            <div
+                              className="font-inherit relative w-full max-w-full"
                               style={{
-                                marginRight: `${iconRefs.current[header.index]?.getBoundingClientRect().width}px`
+                                paddingRight: `${iconRefs.current[header.index]?.getBoundingClientRect().width}px`
                               }}
                             >
                               <span
@@ -238,7 +239,7 @@ function Table<TData extends RowData>({
                                   />
                                 </span>
                               </When>
-                            </span>
+                            </div>
                           </div>
                         </th>
                       );
diff --git a/src/components/elements/Table/TableVariants.ts b/src/components/elements/Table/TableVariants.ts
index fd80fb984..a444c5694 100644
--- a/src/components/elements/Table/TableVariants.ts
+++ b/src/components/elements/Table/TableVariants.ts
@@ -97,9 +97,9 @@ export const VARIANT_TABLE_SITE_POLYGON_REVIEW = {
   table: "border-collapse",
   name: "border-airtable",
   tableWrapper: "border border-neutral-200 rounded-lg overflow-hidden",
-  trHeader: "bg-neutral-150",
+  trHeader: "bg-neutral-150 sticky top-0 z-auto",
   thHeader:
-    "first:pl-4 first:pr-2 last:pl-2 last:pr-4 border-y border-neutral-200 text-14-semibold whitespace-normal px-2 border-t-0",
+    "first:pl-4 first:pr-2 last:pl-2 last:pr-4 border-y border-neutral-200 text-14-semibold whitespace-normal px-2 border-t-0 sticky top-0 z-auto",
   tBody: "",
   trBody: "bg-white border-y border-neutral-200 last:border-b-0",
   tdBody: "text-14-light px-2 py-3 first:pl-4 first:pr-2 last:pl-2 last:pr-4 ",