diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
index 177d64265..abae1c256 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
@@ -51,12 +51,12 @@
         SideSheet,
         EditRecordPermissions,
         RecordActivity,
-        CreateIndex,
         useDatabaseSdk,
         DEFAULT_VECTOR_DIMENSION,
         type Field,
         type Index
     } from '$database/(entity)';
+    import CreateIndex from './indexes/createIndex.svelte';
     import {
         entityColumnSuggestions,
         type ColumnInput,
@@ -368,6 +368,7 @@
     }}>
     <CreateIndex
         entity={collection}
+        databaseType={data.database.type}
         bind:this={createIndex}
         bind:showCreateIndex={$showCreateIndexSheet.show}
         externalFieldKey={$showCreateIndexSheet.column}
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
index bac7d84d6..658575a70 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte
@@ -22,11 +22,13 @@
         entity,
         databaseType,
         showCreateIndex = $bindable(false),
+        externalFieldKey = null,
         onCreateIndex
     }: {
         entity: Entity;
         databaseType: DatabaseType;
         showCreateIndex: boolean;
+        externalFieldKey?: string | null;
         onCreateIndex: (index: CreateIndexesCallbackType) => Promise<void>;
     } = $props();
 
@@ -98,7 +100,9 @@
     function initialize() {
         selectedType =
             databaseType === 'vectorsdb' ? VectorsDBIndexType.Key : DocumentsDBIndexType.Key;
-        fieldList = [{ value: '', order: OrderBy.Asc, length: null }];
+        fieldList = externalFieldKey
+            ? [{ value: externalFieldKey, order: OrderBy.Asc, length: null }]
+            : [{ value: '', order: OrderBy.Asc, length: null }];
         key = `index_${entity.indexes.length + 1}`;
     }