diff --git a/packages/tools/src/structureTools.ts b/packages/tools/src/structureTools.ts
index aabcae760..6f863f4ee 100644
--- a/packages/tools/src/structureTools.ts
+++ b/packages/tools/src/structureTools.ts
@@ -21,6 +21,7 @@ function fillTableExtendedInfo(db: DatabaseInfo): DatabaseInfo {
       columns: (obj.columns || []).map(column => ({
         pureName: obj.pureName,
         schemaName: obj.schemaName,
+        isPrimaryKey: !!(obj.primaryKey && obj.primaryKey.columns.find(x => x.columnName == column.columnName)),
         ...column,
       })),
       primaryKey: obj.primaryKey
diff --git a/packages/web/src/tableeditor/ColumnEditorModal.svelte b/packages/web/src/tableeditor/ColumnEditorModal.svelte
index c6034258b..efc768195 100644
--- a/packages/web/src/tableeditor/ColumnEditorModal.svelte
+++ b/packages/web/src/tableeditor/ColumnEditorModal.svelte
@@ -22,15 +22,7 @@
 
 </script>
 
-<FormProvider
-  initialValues={{
-    ...columnInfo,
-    isPrimaryKey:
-      !!columnInfo &&
-      !!tableInfo?.primaryKey &&
-      !!tableInfo.primaryKey.columns.find(x => x.columnName == columnInfo.columnName),
-  }}
->
+<FormProvider initialValues={columnInfo}>
   <ModalBase {...$$restProps}>
     <svelte:fragment slot="header"
       >{columnInfo ? 'Edit column' : `Add column ${(tableInfo?.columns || []).length + 1}`}</svelte:fragment