diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
index cb8fd573f..e08c332c2 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte
@@ -316,7 +316,7 @@
 <ManageFileTokenModal
     isDelete={tokenDeleteMode}
     fileToken={selectedFileToken}
-    bind:showCreate={showManageToken}
+    bind:show={showManageToken}
     on:created={({ detail: expiry }) => createFileToken(expiry)}
     on:updated={({ detail: newExpiry }) => updateFileTokenExpiry(newExpiry)}
     on:deleted={async () => await deleteFileToken(selectedFileToken)} />
diff --git a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte
index b55e7e341..49dc54f84 100644
--- a/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte
+++ b/src/routes/(console)/project-[project]/storage/bucket-[bucket]/file-[file]/manageFileToken.svelte
@@ -10,9 +10,10 @@
     import { Button } from '$lib/elements/forms';
     import { ExpirationInput, Modal } from '$lib/components';
     import { createEventDispatcher } from 'svelte';
+    import { Confirm } from '$lib/components/index.js';
 
+    export let show = false;
     export let isDelete = false;
-    export let showCreate = false;
     export let fileToken: object | undefined = undefined;
 
     let expire = null;
@@ -20,8 +21,8 @@
     const dispatch = createEventDispatcher();
 
     function close() {
+        show = false;
         fileToken = null;
-        showCreate = false;
     }
 
     function handleFileToken() {
@@ -33,14 +34,14 @@
         close();
     }
 
-    $: if (!showCreate) {
+    $: if (!show) {
         expire = null;
         fileToken = null;
     }
 </script>
 
 {#if isDelete}
-    <Modal bind:show={showCreate} onSubmit={handleFileToken} title="Delete token">
+    <Confirm bind:open={show} title="Delete token" onSubmit={handleFileToken}>
         {@const formattedDate = cleanFormattedDate(fileToken.created)}
         <p data-private>
             Are you sure you want to delete the file token created on <b>{formattedDate}</b>?
@@ -55,17 +56,9 @@
                 This token has never been accessed.
             {/if}
         </p>
-
-        <svelte:fragment slot="footer">
-            <Button secondary on:click={close}>Cancel</Button>
-            <Button danger submit>Delete</Button>
-        </svelte:fragment>
-    </Modal>
+    </Confirm>
 {:else}
-    <Modal
-        bind:show={showCreate}
-        onSubmit={handleFileToken}
-        title={`${fileToken ? 'Edit' : 'Create'} file token`}>
+    <Modal {show} onSubmit={handleFileToken} title={`${fileToken ? 'Edit' : 'Create'} file token`}>
         <!-- TODO: docs link needed-->
         <svelte:fragment slot="description">
             {#if fileToken}