diff --git a/packages/typegen/web/src/components/metadata-fields-dialog/FieldsDataGrid.tsx b/packages/typegen/web/src/components/metadata-fields-dialog/FieldsDataGrid.tsx
index 377acf91..e9ce4658 100644
--- a/packages/typegen/web/src/components/metadata-fields-dialog/FieldsDataGrid.tsx
+++ b/packages/typegen/web/src/components/metadata-fields-dialog/FieldsDataGrid.tsx
@@ -73,13 +73,13 @@ export function FieldsDataGrid({ table, isLoading, isError, error, open }: Field
       table={table}
       tableLayout={{ width: "auto", headerSticky: true }}
     >
-      <DataGridContainer border={true} className="h-full">
+      <DataGridContainer border={true}>
         <div
           className="overflow-auto"
           ref={tableContainerRef}
           style={{
             contain: "strict",
-            height: "100%",
+            height: "calc(90vh - 280px)", // Adjust based on dialog header and search input height
           }}
         >
           <table className="w-full border-separate border-spacing-0">
diff --git a/packages/typegen/web/src/components/metadata-fields-dialog/TableOptionsForm.tsx b/packages/typegen/web/src/components/metadata-fields-dialog/TableOptionsForm.tsx
index 0f22be60..4ba0a848 100644
--- a/packages/typegen/web/src/components/metadata-fields-dialog/TableOptionsForm.tsx
+++ b/packages/typegen/web/src/components/metadata-fields-dialog/TableOptionsForm.tsx
@@ -48,7 +48,7 @@ export function TableOptionsForm({
   const isDisabled = currentTableIndex < 0 || configType !== "fmodata" || !open;
 
   return (
-    <div className="shrink-0 border-border border-t pt-4">
+    <div className="shrink-0 pt-3">
       <div className="flex gap-4">
         <FormField
           control={control}