diff --git a/src/components/TableSettings/index.tsx b/src/components/TableSettings/index.tsx
index 8f11b2f8..a2ccf90f 100644
--- a/src/components/TableSettings/index.tsx
+++ b/src/components/TableSettings/index.tsx
@@ -25,6 +25,7 @@ import {
   TABLE_GROUP_SCHEMAS,
   TABLE_SCHEMAS,
 } from "@src/config/dbPaths";
+import { Controller } from "react-hook-form";
 
 export enum TableSettingsDialogModes {
   create,
@@ -203,6 +204,13 @@ export default function TableSettings({
 
         return (
           <>
+            <Controller
+              control={formFieldsProps.control}
+              name="_schema"
+              defaultValue={{}}
+              render={() => <></>}
+            />
+
             <Stack
               direction="row"
               spacing={1}
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index c9a21af7..dae0f598 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -78,10 +78,10 @@ export default function HomePage() {
       data: null,
     });
 
-  const handleCreateTable = () =>
+  const handleCreateTable = (data?: null | (Table & { tableType: string })) =>
     setSettingsDialogState({
       mode: TableSettingsDialogModes.create,
-      data: null,
+      data: data || null,
     });
 
   const [settingsDocState] = useDoc(
@@ -107,7 +107,7 @@ export default function HomePage() {
         <Fab
           color="secondary"
           aria-label="Create table"
-          onClick={handleCreateTable}
+          onClick={() => handleCreateTable()}
           sx={{
             zIndex: "speedDial",
             position: "fixed",