diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
index 14971f603..8f491cb2b 100644
--- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
@@ -208,5 +208,9 @@
 
 <slot />
 
-<CreateAttribute {...$createAttributeArgs} />
-<CreateIndex bind:showCreateIndex={$showCreateIndex} />
+{#if $createAttributeArgs.showCreate}
+    <CreateAttribute {...$createAttributeArgs} />
+{/if}
+{#if $showCreateIndex}
+    <CreateIndex bind:showCreateIndex={$showCreateIndex} />
+{/if}