diff --git a/dbrepo-ui/components/table/TableSchema.vue b/dbrepo-ui/components/table/TableSchema.vue
index d6b9c138853e9638ad5291bfd30ccf6b6da09e07..f7cb3b3eb09a7d708a4cef5dce9d9e402ad7fc0b 100644
--- a/dbrepo-ui/components/table/TableSchema.vue
+++ b/dbrepo-ui/components/table/TableSchema.vue
@@ -152,7 +152,6 @@
           <v-checkbox
             v-model="c.unique"
             :disabled="disabled || c.type === 'serial'"
-            :hidden="c.primary_key"
             :label="$t('pages.table.subpages.schema.unique.label')" />
         </v-col>
         <v-col
@@ -169,7 +168,6 @@
         </v-col>
       </v-row>
       <v-row
-        v-if="columns.length !== 0"
         dense>
         <v-col>
           <v-btn
@@ -182,8 +180,7 @@
             @click="addColumn()" />
         </v-col>
       </v-row>
-      <v-row
-        v-if="columns.length !== 0">
+      <v-row>
         <v-col>
           <v-btn
             color="secondary"
@@ -252,7 +249,7 @@ export default {
       return this.$vuetify.theme.global.name.toLowerCase().endsWith('contrast') ? runtimeConfig.public.variant.button.contrast : runtimeConfig.public.variant.button.normal
     },
     showPrimaryKeyWarning () {
-      if (this.columns.length === 0) {
+      if (this.disabled) {
         return false
       }
       return this.columns.filter(c => c.primary_key).length === 0
diff --git a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
index 088190ac5a2fe8a8c9deb5d943c2069b216d2725..54d539ed17154c4235d7db9121463d1aab5ebd5e 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
@@ -159,7 +159,7 @@
                 <TableSchema
                   ref="schema"
                   :back="false"
-                  :disabled="step > 4"
+                  :disabled="step !== 4"
                   :loading="loading"
                   :submit-text="$t('navigation.continue')"
                   :columns="tableCreate.columns"