diff --git a/apps/frontend/src/lib/components/blocks/create-table/create-table-sheet.svelte b/apps/frontend/src/lib/components/blocks/create-table/create-table-sheet.svelte
index 52c178275..7ba0adabd 100644
--- a/apps/frontend/src/lib/components/blocks/create-table/create-table-sheet.svelte
+++ b/apps/frontend/src/lib/components/blocks/create-table/create-table-sheet.svelte
@@ -3,9 +3,9 @@
   import CreateTable from "./create-table.svelte"
   import { Button } from "$lib/components/ui/button"
   import ScrollArea from "$lib/components/ui/scroll-area/scroll-area.svelte"
-  import { CREATE_RLS_MODAL, CREATE_TABLE_MODAL, closeModal, isModalOpen, toggleModal } from "$lib/store/modal.store"
+  import { CREATE_TABLE_MODAL, closeModal, isModalOpen } from "$lib/store/modal.store"
   import { baseId, currentBase } from "$lib/store/base.store"
-  import { QueryObserver, useIsMutating, useQueryClient } from "@tanstack/svelte-query"
+  import { useIsMutating } from "@tanstack/svelte-query"
   import { LoaderCircleIcon } from "lucide-svelte"
 
   const isCreating = useIsMutating({ mutationKey: ["createTable"] })
@@ -13,6 +13,8 @@
 
 <Sheet.Root
   open={$isModalOpen(CREATE_TABLE_MODAL)}
+  closeOnOutsideClick={false}
+  closeOnEscape={false}
   onOpenChange={(open) => {
     if (!open) {
       closeModal(CREATE_TABLE_MODAL)
@@ -35,7 +37,7 @@
     </ScrollArea>
 
     <Sheet.Footer>
-      <Button variant="outline" type="button" on:click={() => closeModal(CREATE_RLS_MODAL)}>Cancel</Button>
+      <Button variant="outline" type="button" on:click={() => closeModal(CREATE_TABLE_MODAL)}>Cancel</Button>
       <Button type="submit" disabled={$isCreating > 0} form="createTable">
         {#if $isCreating > 0}
           <LoaderCircleIcon class="mr-2 h-5 w-5 animate-spin" />
diff --git a/apps/frontend/src/lib/components/blocks/create-table/create-table.svelte b/apps/frontend/src/lib/components/blocks/create-table/create-table.svelte
index 47155d0cf..503499122 100644
--- a/apps/frontend/src/lib/components/blocks/create-table/create-table.svelte
+++ b/apps/frontend/src/lib/components/blocks/create-table/create-table.svelte
@@ -53,7 +53,7 @@
       validators: zodClient(schema),
       resetForm: false,
       invalidateAll: true,
-      onUpdate(event) {
+      async onUpdate(event) {
         if (!event.form.valid) {
           console.log(event.form.errors)
           return
@@ -61,7 +61,7 @@
         const baseId = $currentBase?.id
         if (!baseId) return
 
-        $mutation.mutate({
+        await $mutation.mutateAsync({
           ...event.form.data,
           baseId: baseId,
         })
diff --git a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/attachment-cell.svelte b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/attachment-cell.svelte
index 6238c92bb..452a30e5d 100644
--- a/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/attachment-cell.svelte
+++ b/apps/frontend/src/lib/components/blocks/grid-view/editable-cell/attachment-cell.svelte
@@ -173,7 +173,7 @@
                     class="group relative col-span-1 flex w-full items-center justify-center rounded-sm border"
                   >
                     {#if isImage(v)}
-                      <button class="h-10 w-10" on:click={() => ($selectedAttachment = v)}>
+                      <button type="button" class="h-full w-full" on:click={() => ($selectedAttachment = v)}>
                         <img src={v.signedUrl ?? v.url} alt={v.name} />
                       </button>
                     {:else}
@@ -183,6 +183,7 @@
                     <AlertDialog.Root>
                       <AlertDialog.Trigger>
                         <button
+                          type="button"
                           class="absolute right-0 top-1 hidden -translate-y-1/2 translate-x-1/2 group-hover:block"
                         >
                           <XIcon class="text-muted-foreground h-5 w-5"></XIcon>
@@ -201,6 +202,7 @@
                         <AlertDialog.Footer>
                           <AlertDialog.Cancel>Cancel</AlertDialog.Cancel>
                           <AlertDialog.Action
+                            type="button"
                             on:click={() => removeFile(i)}
                             class="bg-red-500 text-white hover:bg-red-600">Delete</AlertDialog.Action
                           >