diff --git a/packages/web/src/elements/ObjectFieldsEditor.svelte b/packages/web/src/elements/ObjectFieldsEditor.svelte
index 337625f1a..684535848 100644
--- a/packages/web/src/elements/ObjectFieldsEditor.svelte
+++ b/packages/web/src/elements/ObjectFieldsEditor.svelte
@@ -6,6 +6,7 @@
   import FormProviderCore from '../forms/FormProviderCore.svelte';
   import FormTextField from '../forms/FormTextField.svelte';
   import FormSelectField from '../forms/FormSelectField.svelte';
+  import stableStringify from 'json-stable-stringify';
 
   export let title;
   export let fieldDefinitions;
@@ -18,7 +19,9 @@
 
   const valuesStore = writable(values || {});
 
-  $: onChangeValues($valuesStore);
+  $: if (stableStringify($valuesStore) != stableStringify(values)) {
+    onChangeValues($valuesStore);
+  }
 </script>
 
 <div class="wrapper">
diff --git a/packages/web/src/tabs/TableStructureTab.svelte b/packages/web/src/tabs/TableStructureTab.svelte
index 7bcb6bdf6..10de41a31 100644
--- a/packages/web/src/tabs/TableStructureTab.svelte
+++ b/packages/web/src/tabs/TableStructureTab.svelte
@@ -150,7 +150,7 @@
     schemaList={$schemaList}
     {driver}
     {resetCounter}
-    isCreateTable={objectTypeField == 'tables' && !$editorValue?.base}
+    isCreateTable={objectTypeField == 'tables' && $editorValue && !$editorValue?.base}
     setTableInfo={objectTypeField == 'tables' && !$connection?.isReadOnly && hasPermission(`dbops/model/edit`)
       ? tableInfoUpdater =>
           setEditorData(tbl =>