diff --git a/src/lib/elements/forms/inputText.svelte b/src/lib/elements/forms/inputText.svelte
index 0da7f7b388..2c69fa8e49 100644
--- a/src/lib/elements/forms/inputText.svelte
+++ b/src/lib/elements/forms/inputText.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { SvelteComponent, onMount } from 'svelte';
+    import { SvelteComponent, onMount, tick } from 'svelte';
     import { FormItem, FormItemPart, Helper, Label } from '.';
     import NullCheckbox from './nullCheckbox.svelte';
     import TextCounter from './textCounter.svelte';
@@ -30,8 +30,9 @@
     let error: string;
     let show = false;
 
-    onMount(() => {
+    onMount(async () => {
         if (element && autofocus) {
+            await tick();
             element.focus();
         }
     });
diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
index dc8ffbbddf..1676df8027 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte
@@ -65,19 +65,19 @@
     }
 </script>
 
-{#if selectedAttribute}
-    <Modal {error} size="big" bind:show={showEdit} onSubmit={submit} icon={option?.icon}>
-        <svelte:fragment slot="title">
-            <div class="u-flex u-cross-center u-gap-8">
-                {option?.name}
-                {#if option?.type === 'relationship'}
-                    <div class="tag eyebrow-heading-3">
-                        <span class="text u-x-small">Beta</span>
-                    </div>
-                {/if}
-            </div>
-        </svelte:fragment>
-        <FormList>
+<Modal {error} size="big" bind:show={showEdit} onSubmit={submit} icon={option?.icon}>
+    <svelte:fragment slot="title">
+        <div class="u-flex u-cross-center u-gap-8">
+            {option?.name}
+            {#if option?.type === 'relationship'}
+                <div class="tag eyebrow-heading-3">
+                    <span class="text u-x-small">Beta</span>
+                </div>
+            {/if}
+        </div>
+    </svelte:fragment>
+    <FormList>
+        {#if selectedAttribute}
             {#if selectedAttribute?.type !== 'relationship'}
                 <InputText
                     id="key"
@@ -93,10 +93,10 @@
                     bind:data={selectedAttribute}
                     on:close={() => (option = null)} />
             {/if}
-        </FormList>
-        <svelte:fragment slot="footer">
-            <Button secondary on:click={() => (showEdit = false)}>Cancel</Button>
-            <Button submit disabled={deepEqual(currentAttr, selectedAttribute)}>Update</Button>
-        </svelte:fragment>
-    </Modal>
-{/if}
+        {/if}
+    </FormList>
+    <svelte:fragment slot="footer">
+        <Button secondary on:click={() => (showEdit = false)}>Cancel</Button>
+        <Button submit disabled={deepEqual(currentAttr, selectedAttribute)}>Update</Button>
+    </svelte:fragment>
+</Modal>
diff --git a/tests/unit/elements/inputText.test.ts b/tests/unit/elements/inputText.test.ts
index e2f6f5dff8..2c2ef2c6bb 100644
--- a/tests/unit/elements/inputText.test.ts
+++ b/tests/unit/elements/inputText.test.ts
@@ -2,6 +2,7 @@ import { expect, test } from 'vitest';
 import { render } from '@testing-library/svelte';
 import userEvent from '@testing-library/user-event';
 import { InputText } from '../../../src/lib/elements/forms';
+import { tick } from 'svelte';
 
 test('shows text input', () => {
     const { getByText, getByLabelText } = render(InputText, { id: 'input', label: 'input' });
@@ -24,9 +25,9 @@ test('shows text input - disabled', () => {
     expect(getByLabelText('input')).toBeDisabled();
 });
 
-test('shows text input - autofocus', () => {
+test('shows text input - autofocus', async () => {
     const { getByLabelText } = render(InputText, { id: 'input', label: 'input', autofocus: true });
-
+    await tick();
     expect(getByLabelText('input')).toHaveFocus();
 });