diff --git a/packages/tools/src/SqlDumper.ts b/packages/tools/src/SqlDumper.ts
index ac55e7162..89897e1fd 100644
--- a/packages/tools/src/SqlDumper.ts
+++ b/packages/tools/src/SqlDumper.ts
@@ -190,7 +190,7 @@ export class SqlDumper implements AlterProcessor {
     if (includeNullable) {
       this.put(column.notNull ? '^not ^null' : '^null');
     }
-    if (includeDefault && column.defaultValue != null) {
+    if (includeDefault && column.defaultValue?.trim()) {
       this.columnDefault(column);
     }
   }
diff --git a/packages/web/src/tableeditor/TableEditor.svelte b/packages/web/src/tableeditor/TableEditor.svelte
index c7f11ae24..cbb61e255 100644
--- a/packages/web/src/tableeditor/TableEditor.svelte
+++ b/packages/web/src/tableeditor/TableEditor.svelte
@@ -35,7 +35,7 @@
   });
 
   registerCommand({
-    id: 'tableEditor.addINdex',
+    id: 'tableEditor.addIndex',
     category: 'Table editor',
     name: 'Add index',
     icon: 'icon add-key',
@@ -44,6 +44,17 @@
     testEnabled: () => getCurrentEditor()?.writable(),
     onClick: () => getCurrentEditor().addIndex(),
   });
+
+  registerCommand({
+    id: 'tableEditor.addUnique',
+    category: 'Table editor',
+    name: 'Add unique',
+    icon: 'icon add-key',
+    toolbar: true,
+    isRelatedToTab: true,
+    testEnabled: () => getCurrentEditor()?.writable(),
+    onClick: () => getCurrentEditor().addUnique(),
+  });
 </script>
 
 <script lang="ts">
@@ -69,6 +80,7 @@
   import ForeignKeyEditorModal from './ForeignKeyEditorModal.svelte';
   import IndexEditorModal from './IndexEditorModal.svelte';
   import PrimaryKeyEditorModal from './PrimaryKeyEditorModal.svelte';
+  import UniqueEditorModal from './UniqueEditorModal.svelte';
 
   export const activator = createActivator('TableEditor', true);
 
@@ -118,11 +130,20 @@
     });
   }
 
+  export function addUnique() {
+    showModal(UniqueEditorModal, {
+      setTableInfo,
+      tableInfo,
+      dbInfo,
+    });
+  }
+
   $: columns = tableInfo?.columns;
   $: primaryKey = tableInfo?.primaryKey;
   $: foreignKeys = tableInfo?.foreignKeys;
   $: dependencies = tableInfo?.dependencies;
   $: indexes = tableInfo?.indexes;
+  $: uniques = tableInfo?.uniques;
 
   $: {
     tableInfo;
@@ -223,6 +244,34 @@
     onAddNew={addIndex}
     title={`Indexes (${indexes?.length || 0})`}
     clickable={writable()}
+    on:clickrow={e => showModal(UniqueEditorModal, { constraintInfo: e.detail, tableInfo, setTableInfo })}
+    columns={[
+      {
+        fieldName: 'columns',
+        header: 'Columns',
+        slot: 0,
+      },
+      writable()
+        ? {
+            fieldName: 'actions',
+            sortable: true,
+            slot: 1,
+          }
+        : null,
+    ]}
+  >
+    <svelte:fragment slot="name" let:row><ConstraintLabel {...row} /></svelte:fragment>
+    <svelte:fragment slot="0" let:row>{row?.columns.map(x => x.columnName).join(', ')}</svelte:fragment>
+    <svelte:fragment slot="1" let:row
+      ><Link onClick={() => setTableInfo(tbl => editorDeleteConstraint(tbl, row))}>Remove</Link></svelte:fragment
+    >
+  </ObjectListControl>
+
+  <ObjectListControl
+    collection={uniques}
+    onAddNew={addUnique}
+    title={`Unique constraints (${uniques?.length || 0})`}
+    clickable={writable()}
     on:clickrow={e => showModal(IndexEditorModal, { constraintInfo: e.detail, tableInfo, setTableInfo })}
     columns={[
       {
diff --git a/packages/web/src/tableeditor/UniqueEditorModal.svelte b/packages/web/src/tableeditor/UniqueEditorModal.svelte
new file mode 100644
index 000000000..c136f7e43
--- /dev/null
+++ b/packages/web/src/tableeditor/UniqueEditorModal.svelte
@@ -0,0 +1,17 @@
+<script lang="ts">
+  import ColumnsConstraintEditorModal from './ColumnsConstraintEditorModal.svelte';
+
+  export let constraintInfo;
+  export let setTableInfo;
+  export let tableInfo;
+
+</script>
+
+<ColumnsConstraintEditorModal
+  {...$$restProps}
+  constraintLabel="unique"
+  constraintType="unique"
+  {constraintInfo}
+  {setTableInfo}
+  {tableInfo}
+/>