diff --git a/src/components/dataset/entities.vue b/src/components/dataset/entities.vue
index 396ccdd1c..76c830b92 100644
--- a/src/components/dataset/entities.vue
+++ b/src/components/dataset/entities.vue
@@ -19,6 +19,11 @@ except according to the terms contained in the LICENSE file.
             class="btn btn-primary" @click="upload.show()">
             <span class="icon-upload"></span>{{ $t('upload') }}
           </button>
+          <button v-if="project.dataExists && project.permits('entity.create')"
+            id="dataset-entities-create-button" type="button"
+            class="btn btn-primary" @click="create.show()">
+            <span class="icon-plus-circle"></span>{{ $t('new') }}
+          </button>
           <template v-if="deletedEntityCount.dataExists">
             <button v-if="canDelete && (deletedEntityCount.value > 0 || deleted)" type="button"
               class="btn toggle-deleted-entities" :class="{ 'btn-danger': deleted, 'btn-link': !deleted }"
@@ -42,6 +47,8 @@ except according to the terms contained in the LICENSE file.
 
     <entity-upload v-if="dataset.dataExists" v-bind="upload"
       @hide="upload.hide()" @success="afterUpload"/>
+    <entity-create v-if="dataset.dataExists" v-bind="create"
+      @hide="create.hide()" @success="afterCreate"/>
     <odata-analyze v-bind="analyze" :odata-url="odataUrl" @hide="analyze.hide()"/>
   </div>
 </template>
@@ -50,6 +57,7 @@ except according to the terms contained in the LICENSE file.
 import { defineAsyncComponent, watchEffect, computed } from 'vue';
 import { useRouter } from 'vue-router';
 
+import EntityCreate from '../entity/create.vue';
 import EntityList from '../entity/list.vue';
 import OdataAnalyze from '../odata/analyze.vue';
 import OdataDataAccess from '../odata/data-access.vue';
@@ -66,6 +74,7 @@ import { noop } from '../../util/util';
 export default {
   name: 'DatasetEntities',
   components: {
+    EntityCreate,
     OdataAnalyze,
     OdataDataAccess,
     EntityList,
@@ -114,6 +123,7 @@ export default {
   data() {
     return {
       upload: modalData('EntityUpload'),
+      create: modalData(),
       analyze: modalData()
     };
   },
@@ -135,6 +145,12 @@ export default {
       // reflects the new entities.
       this.dataset.entities += count;
     },
+    afterCreate() {
+      this.create.hide();
+      this.alert.success(this.$t('alert.create'));
+      this.$refs.list.reset();
+      this.dataset.entities += 1;
+    },
     fetchDeletedCount() {
       this.deletedEntityCount.request({
         method: 'GET',
@@ -197,8 +213,11 @@ export default {
 {
   "en": {
     "upload": "Upload Entities",
+    // This is shown on a button for creating new Entities
+    "new": "New",
     "alert": {
-      "upload": "Your Entities have been successfully uploaded."
+      "upload": "Your Entities have been successfully uploaded.",
+      "create": "Entity has been successfully created."
     },
     "purgeDescription": "Entities are deleted after 30 days in the Trash",
     "action": {
diff --git a/src/components/entity/create.vue b/src/components/entity/create.vue
new file mode 100644
index 000000000..fc3b4cc3d
--- /dev/null
+++ b/src/components/entity/create.vue
@@ -0,0 +1,16 @@
+<template>
+  <entity-upsert-modal id="entity-create" v-bind="props" create
+    @hide="emit('hide')" @success="emit('success', $event)"/>
+</template>
+
+<script setup>
+import EntityUpsertModal from './upsert.vue';
+
+defineOptions({
+  name: 'EntityCreate'
+});
+const props = defineProps({
+  state: Boolean
+});
+const emit = defineEmits(['hide', 'success']);
+</script>
diff --git a/src/components/entity/update.vue b/src/components/entity/update.vue
index 6f9c349aa..258e61168 100644
--- a/src/components/entity/update.vue
+++ b/src/components/entity/update.vue
@@ -10,69 +10,12 @@ including this file, may be copied, modified, propagated, or distributed
 except according to the terms contained in the LICENSE file.
 -->
 <template>
-  <modal id="entity-update" :state="state" :hideable="!awaitingResponse"
-    size="large" backdrop @shown="afterShown" @hide="$emit('hide')">
-    <template #title>{{ $t('title', currentVersion) }}</template>
-    <template #body>
-      <form @submit.prevent="submit">
-        <div class="table-scroll">
-          <table class="table">
-            <thead>
-              <tr>
-                <th ref="labelCellHeader" class="label-cell">
-                  <span class="sr-only">{{ $t('resource.property') }}</span>
-                </th>
-                <th ref="oldValueHeader" class="old-value">
-                  {{ $t('header.currentValue') }}
-                </th>
-                <th class="new-value">{{ $t('header.updatedValue') }}</th>
-              </tr>
-            </thead>
-            <tbody>
-              <entity-update-row ref="labelRow" v-model="label"
-                :old-value="currentVersion.label"
-                :label="$t('entity.entityLabel')" required/>
-              <template v-if="dataset.dataExists">
-                <entity-update-row v-for="{ name } of dataset.properties"
-                  :key="name" ref="propertyRows" v-model="data[name]"
-                  :old-value="currentVersion.data[name]" :label="name"
-                  :disabled="name === 'geometry' && geometryDisabled"
-                  :disabled-message="$t('geometryDisabled')"/>
-              </template>
-            </tbody>
-          </table>
-        </div>
-        <div class="modal-actions">
-          <button type="button" class="btn btn-link"
-            :aria-disabled="awaitingResponse" @click="$emit('hide')">
-            {{ $t('action.neverMind') }}
-          </button>
-          <button type="submit" class="btn btn-primary"
-            :aria-disabled="awaitingResponse">
-            {{ $t('action.update') }} <spinner :state="awaitingResponse"/>
-          </button>
-        </div>
-      </form>
-    </template>
-  </modal>
+  <entity-upsert-modal id="entity-update" v-bind="props"
+    @hide="emit('hide')" @success="emit('success', $event)"/>
 </template>
 
 <script setup>
-import { computed, nextTick, ref, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import EntityUpdateRow from './update/row.vue';
-import Modal from '../modal.vue';
-import Spinner from '../spinner.vue';
-
-import useColumnGrow from '../../composables/column-grow';
-import useRequest from '../../composables/request';
-import { apiPaths } from '../../util/request';
-import { noop } from '../../util/util';
-import { px, styleBox } from '../../util/dom';
-import { useRequestData } from '../../request-data';
-
-const { t } = useI18n();
+import EntityUpsertModal from './upsert.vue';
 
 defineOptions({
   name: 'EntityUpdate'
@@ -83,227 +26,5 @@ const props = defineProps({
   entity: Object,
   geometryDisabled: Boolean
 });
-
 const emit = defineEmits(['hide', 'success']);
-
-const { dataset } = useRequestData();
-
-const label = ref(undefined);
-const data = ref(Object.create(null));
-watch(() => props.state, (state) => {
-  if (!state) {
-    label.value = undefined;
-    data.value = Object.create(null);
-  }
-});
-
-
-
-const { request, awaitingResponse } = useRequest();
-const submit = () => {
-  const { entity } = props;
-  const url = apiPaths.entity(dataset.projectId, dataset.name, entity.uuid, { baseVersion: entity.currentVersion.version });
-
-  request.patch(
-    url,
-    { label: label.value, data: data.value },
-    {
-      problemToAlert: ({ code }) => {
-        if (code === 409.15) return t('problem.409_15');
-        return null;
-      }
-    }
-  )
-    .then(response => {
-      // It is the responsibility of the parent component to patch the entity.
-      emit('success', response.data);
-    })
-    .catch(noop);
-};
-
-const labelCellHeader = ref(null);
-const { resize: resizeLabelCells } = useColumnGrow(labelCellHeader, 1.5);
-const oldValueHeader = ref(null);
-const labelRow = ref(null);
-// Resizes th.old-value so that the width of the old value and the width of the
-// textarea value are the same. Before this resizing, th.old-value and
-// th.new-value have the same width. We need to decrease the width of
-// th.old-value to account for the padding and borders of the textarea.
-const resizeOldValue = () => {
-  // Remove any width that the function previously set.
-  oldValueHeader.value.style.width = '';
-  const { width } = oldValueHeader.value.getBoundingClientRect();
-  const textarea = styleBox(getComputedStyle(labelRow.value.textarea.el));
-  const paddingAndBorders = textarea.paddingLeft + textarea.paddingRight +
-    textarea.borderLeft + textarea.borderRight;
-  oldValueHeader.value.style.width = px(width - (paddingAndBorders / 2));
-};
-const propertyRows = ref([]);
-const afterShown = () => {
-  labelRow.value.textarea.focus();
-
-  // Resize elements. We wait a tick in case props.entity was changed at the
-  // same time as props.state. If a change to props.entity results in changes to
-  // the DOM, we need those changes to the DOM to be made before resizing
-  // elements based on content in the DOM.
-  nextTick(() => {
-    resizeLabelCells();
-    resizeOldValue();
-
-    labelRow.value.textarea.resize();
-    for (const row of propertyRows.value) row.textarea.resize();
-  });
-};
-
-const noEntity = {
-  currentVersion: { label: '', data: {} }
-};
-const currentVersion = computed(() =>
-  (props.entity ?? noEntity).currentVersion);
 </script>
-
-<style lang="scss">
-@import '../../assets/scss/variables';
-
-#entity-update {
-  .modal-dialog { margin-top: 15vh; }
-  .table-scroll {
-    max-height: calc(70vh -
-      #{/* .modal-header */ 46px + /* .modal-actions */ 100px});
-    overflow-y: auto;
-  }
-
-  table { margin-bottom: 0; }
-
-  table { table-layout: fixed; }
-  thead {
-    .label-cell { width: 16.66666667%; }
-  }
-
-  tr:nth-child(2) td { border-top-color: #bbb; }
-
-  .alert { margin: 15px; }
-}
-</style>
-
-<i18n lang="json5">
-{
-  "en": {
-    // This is the title at the top of a pop-up. {label} is the label of an
-    // Entity.
-    "title": "Update {label}",
-    // This is the text of a table column header. "Value" refers to the value of
-    // an Entity property.
-    "header": {
-      "currentValue": "Current Value",
-      "updatedValue": "Updated Value"
-    },
-    "geometryDisabled": "Geometry can’t be updated from the map.",
-    "problem": {
-      "409_15": "Data has been modified by another user. Please refresh to see the updated data."
-    }
-  }
-}
-</i18n>
-
-<!-- Autogenerated by destructure.js -->
-<i18n>
-{
-  "cs": {
-    "title": "Aktualizace {label}",
-    "header": {
-      "currentValue": "Aktuální hodnota",
-      "updatedValue": "Aktualizovaná hodnota"
-    },
-    "problem": {
-      "409_15": "Data byla upravena jiným uživatelem. Aktualizujte prosím stránku, abyste viděli aktualizovaná data."
-    }
-  },
-  "de": {
-    "title": "Aktualisieren {label}",
-    "header": {
-      "currentValue": "Aktueller Wert",
-      "updatedValue": "Aktualisierter Wert"
-    },
-    "geometryDisabled": "Die Geometrie kann nicht über die Karte aktualisiert werden.",
-    "problem": {
-      "409_15": "Die Daten wurden von einem anderen Benutzer geändert. Bitte aktualisieren Sie die Seite, um die aktualisierten Daten anzuzeigen."
-    }
-  },
-  "es": {
-    "title": "Actualizar {label}",
-    "header": {
-      "currentValue": "Valor actual",
-      "updatedValue": "Valor actualizado"
-    },
-    "geometryDisabled": "La geometría no se puede actualizar desde el mapa.",
-    "problem": {
-      "409_15": "Los datos han sido modificados por otro usuario. Actualice para ver los datos actualizados."
-    }
-  },
-  "fr": {
-    "title": "Mise à jour {label}",
-    "header": {
-      "currentValue": "Valeur actuelle",
-      "updatedValue": "Valeur Mise à jour"
-    },
-    "geometryDisabled": "La géométrie ne peut être modifiée depuis la carte.",
-    "problem": {
-      "409_15": "Les données ont été modifiées par un autre utilisateur. Merci de rafraîchir pour voir les données mises à jour."
-    }
-  },
-  "it": {
-    "title": "Aggiorna {label}",
-    "header": {
-      "currentValue": "Valore corrente",
-      "updatedValue": "Valore aggiornato"
-    },
-    "geometryDisabled": "La geometria non può essere aggiornata dalla mappa.",
-    "problem": {
-      "409_15": "I dati sono stati modificati da un altro utente. Aggiornare per vedere i dati aggiornati."
-    }
-  },
-  "pt": {
-    "title": "Atualizar {label}",
-    "header": {
-      "currentValue": "Valor Atual",
-      "updatedValue": "Valor Atualizado"
-    },
-    "problem": {
-      "409_15": "Os dados foram modificados por outro usuário. Por favor, atualize a página para ver os dados atualizados."
-    }
-  },
-  "sw": {
-    "title": "Sasisha {label}",
-    "header": {
-      "currentValue": "Thamani ya Sasa",
-      "updatedValue": "Thamani Iliyosasishwa"
-    },
-    "problem": {
-      "409_15": "Data imerekebishwa na mtumiaji mwingine. Tafadhali onyesha upya ili kuona data iliyosasishwa."
-    }
-  },
-  "zh": {
-    "title": "更新{label}",
-    "header": {
-      "currentValue": "当前数值",
-      "updatedValue": "更新后的数值"
-    },
-    "geometryDisabled": "无法通过地图更新几何数据。",
-    "problem": {
-      "409_15": "数据已被其他用户修改，请刷新以查看最新数据。"
-    }
-  },
-  "zh-Hant": {
-    "title": "更新{label}",
-    "header": {
-      "currentValue": "目前數值",
-      "updatedValue": "更新數值"
-    },
-    "geometryDisabled": "無法透過地圖更新地理資料。",
-    "problem": {
-      "409_15": "資料已被另一用戶修改。請重新整理查看更新後的資料。"
-    }
-  }
-}
-</i18n>
diff --git a/src/components/entity/update/row.vue b/src/components/entity/update/row.vue
index 6849000bd..5e082d1ce 100644
--- a/src/components/entity/update/row.vue
+++ b/src/components/entity/update/row.vue
@@ -10,22 +10,16 @@ including this file, may be copied, modified, propagated, or distributed
 except according to the terms contained in the LICENSE file.
 -->
 <template>
-  <tr class="entity-update-row"
-    :class="{ 'uncommitted-change': modelValue != null }">
-    <td class="label-cell">
+  <tr class="entity-update-row">
+    <td v-if="label != null" class="label-cell">
       <label :for="textareaId" v-tooltip.text>
         {{ requiredLabel(label, required) }}
       </label>
     </td>
-    <td class="old-value" :class="{ empty: oldIsEmpty }">
-      <div ref="oldValueContainer">
-        {{ oldIsEmpty ? $t('common.emptyValue') : oldValue }}
-      </div>
-    </td>
     <td class="new-value">
-      <div class="form-group">
+      <div class="form-group" :class="{ 'value-changed': markValueChanged && modelValue != null }">
         <textarea-autosize :id="textareaId" ref="textarea"
-          :model-value="modelValue ?? oldValue ?? ''" :min-height="minHeight"
+          :model-value="modelValue ?? oldValue ?? ''"
           :required="required" :disabled="disabled"
           :disabled-message="disabledMessage" @update:model-value="update"/>
       </div>
@@ -37,7 +31,7 @@ except according to the terms contained in the LICENSE file.
 let id = 0;
 </script>
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { ref } from 'vue';
 
 import TextareaAutosize from '../../textarea-autosize.vue';
 
@@ -49,30 +43,17 @@ defineOptions({
 const props = defineProps({
   modelValue: String,
   oldValue: String,
-  label: {
-    type: String,
-    required: true
-  },
+  label: String,
   required: Boolean,
   disabled: Boolean,
-  disabledMessage: String
+  disabledMessage: String,
+  markValueChanged: Boolean
 });
 const emit = defineEmits(['update:modelValue']);
 
-const oldIsEmpty = computed(() =>
-  props.oldValue == null || props.oldValue === '');
-
 id += 1;
 const textareaId = `entity-update-row-textarea${id}`;
 
-const minHeight = ref(0);
-let minHeightOutdated = true;
-const oldValueContainer = ref(null);
-const setMinHeight = () => {
-  minHeight.value = oldValueContainer.value.getBoundingClientRect().height;
-  minHeightOutdated = false;
-};
-watch(() => props.oldValue, () => { minHeightOutdated = true; });
 
 const update = (value) => {
   // We emit `undefined` if `value` is the same as props.oldValue. If `value` is
@@ -83,55 +64,36 @@ const update = (value) => {
 };
 
 const textarea = ref(null);
-const resize = () => {
-  textarea.value.resize();
-  if (minHeightOutdated) setMinHeight();
-};
-defineExpose({ textarea: computed(() => ({ ...textarea.value, resize })) });
+defineExpose({ textarea });
 </script>
 
 <style lang="scss">
 @import '../../../assets/scss/mixins';
 
 .entity-update-row {
-  td, textarea { font-size: 16px; }
+  td, textarea, label { font-size: 12px; }
 
   $vpadding: 4px;
-  .label-cell, .old-value, .new-value { padding-bottom: $vpadding; }
+  .label-cell, .new-value { padding-bottom: $vpadding; }
   .label-cell {
+    padding-left: 0px;
     padding-right: 15px;
     padding-top: #{$vpadding + $padding-top-form-control};
   }
-  .old-value {
-    padding-top: $vpadding;
-
-    // Add $padding-top-form-control to the <div> rather than the <td> so that
-    // it is included in the minHeight prop passed to TextareaAutosize.
-    div {
-      padding-top: $padding-top-form-control;
-      padding-bottom: $padding-top-form-control;
-    }
-  }
   .new-value {
     padding-top: $vpadding;
-    padding-right: 0px;
   }
 
+    .value-changed {
+      box-shadow: 0 0 0 3px #C8E4EE;
+    }
+
   .label-cell { @include text-overflow-ellipsis; }
   label {
     // Needed for the text to truncate.
     display: inline;
     margin-bottom: 0;
-  }
-
-  .old-value {
-    overflow-wrap: break-word;
-    white-space: break-spaces;
-
-    &.empty {
-      @include italic;
-      color: #999;
-    }
+    font-weight: 400;
   }
 
   .form-group {
diff --git a/src/components/entity/upsert.vue b/src/components/entity/upsert.vue
new file mode 100644
index 000000000..af46b9d6d
--- /dev/null
+++ b/src/components/entity/upsert.vue
@@ -0,0 +1,218 @@
+<template>
+  <modal class="entity-upsert" :state="state" :hideable="!awaitingResponse"
+    size="large" backdrop @shown="afterShown" @hide="$emit('hide')">
+    <template #title>{{ create ? $t('titleCreate') : $t('title', currentVersion) }}</template>
+    <template #body>
+      <form @submit.prevent="submit">
+        <div>{{ $t('entity.entityLabel') }}</div>
+        <table class="table">
+          <tbody>
+            <entity-update-row ref="labelRow" v-model="label"
+              :old-value="currentVersion.label"
+              :mark-value-changed="!create" required/>
+            </tbody>
+        </table>
+        <div class="entity-upsert-properties-header">{{ $t('resource.properties') }}</div>
+        <div class="table-scroll">
+          <table class="table">
+            <thead>
+              <tr>
+                <th class="label-cell">{{ $t('resource.property') }}</th>
+                <th class="new-value">{{ $t('header.value') }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <template v-if="dataset.dataExists">
+                <entity-update-row v-for="{ name } of dataset.properties"
+                  :key="name" ref="propertyRows" v-model="data[name]"
+                  :old-value="currentVersion.data[name]" :label="name"
+                  :disabled="!create && name === 'geometry' && geometryDisabled"
+                  :disabled-message="$t('geometryDisabled')"
+                  :mark-value-changed="!create"/>
+              </template>
+            </tbody>
+          </table>
+        </div>
+        <div class="modal-actions">
+          <button type="button" class="btn btn-link"
+            :aria-disabled="awaitingResponse" @click="$emit('hide')">
+            {{ $t('action.cancel') }}
+          </button>
+          <button type="submit" class="btn btn-primary"
+            :aria-disabled="awaitingResponse">
+            {{ create ? $t('action.create') : $t('action.update') }} <spinner :state="awaitingResponse"/>
+          </button>
+        </div>
+      </form>
+    </template>
+  </modal>
+</template>
+
+<script setup>
+import { computed, nextTick, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import EntityUpdateRow from './update/row.vue';
+
+import Modal from '../modal.vue';
+import Spinner from '../spinner.vue';
+
+import useRequest from '../../composables/request';
+import { apiPaths } from '../../util/request';
+import { noop } from '../../util/util';
+import { useRequestData } from '../../request-data';
+
+const { t } = useI18n();
+
+defineOptions({
+  name: 'EntityUpsert'
+});
+const props = defineProps({
+  state: Boolean,
+  // An entity in the format of a REST response (not OData)
+  entity: Object,
+  create: Boolean,
+  geometryDisabled: Boolean
+});
+
+const emit = defineEmits(['hide', 'success']);
+
+const propertyRows = ref([]);
+const labelRow = ref(null);
+
+const label = ref(undefined);
+const data = ref(Object.create(null));
+
+const noEntity = {
+  currentVersion: { label: '', data: {} }
+};
+const currentVersion = computed(() =>
+  (props.entity ?? noEntity).currentVersion);
+
+watch(() => props.state, (state) => {
+  if (!state) {
+    label.value = undefined;
+    data.value = Object.create(null);
+  }
+});
+
+
+// ----
+// Resize text areas to fit content
+
+const afterShown = () => {
+  labelRow.value.textarea.focus();
+
+  // Resize elements. We wait a tick in case props.entity was changed at the
+  // same time as props.state. If a change to props.entity results in changes to
+  // the DOM, we need those changes to the DOM to be made before resizing
+  // elements based on content in the DOM.
+  nextTick(() => {
+    labelRow.value.textarea.resize();
+    for (const row of propertyRows.value) row.textarea.resize();
+  });
+};
+
+// ----
+// Requests and modal behavior after sending requests
+
+const { dataset } = useRequestData();
+
+const { request, awaitingResponse } = useRequest();
+const submit = () => {
+  if (props.create) {
+    // Send entity data to POST endpoint for create
+    request.post(
+      apiPaths.entities(dataset.projectId, dataset.name),
+      { label: label.value, data: data.value },
+    )
+      .then(response => {
+        emit('success', response.data);
+      })
+      .catch(noop);
+  } else {
+    // Send entity data + version/uuid info to PATCH endpoint for update
+    const { entity } = props;
+    const url = apiPaths.entity(dataset.projectId, dataset.name, entity.uuid, { baseVersion: entity.currentVersion.version });
+
+    request.patch(
+      url,
+      { label: label.value, data: data.value },
+      {
+        problemToAlert: ({ code }) => {
+          if (code === 409.15) return t('problem.409_15');
+          return null;
+        }
+      }
+    )
+      .then(response => {
+        // It is the responsibility of the parent component to patch the entity.
+        emit('success', response.data);
+      })
+      .catch(noop);
+  }
+};
+</script>
+
+<style lang="scss">
+@import '../../assets/scss/variables';
+
+.entity-upsert {
+  th {
+    font-size: 12px;
+  }
+
+  .modal-dialog { margin-top: 15vh; }
+
+  .entity-upsert-properties-header {
+    font-size: 18px;
+    font-weight: 500;
+    margin-top: 40px;
+  }
+
+  .table-scroll {
+    max-height: calc(70vh -
+      #{/* .modal-header */ 140px + /* .modal-actions */ 100px});
+    overflow-y: auto;
+    border-bottom: none;
+  }
+
+  table {
+    table-layout: fixed;
+  }
+
+  thead {
+    background-color: white;
+  }
+
+  tbody tr td, thead tr th {
+    border: none;
+    padding-left: 0px;
+  }
+
+  .alert { margin: 15px; }
+}
+</style>
+
+<i18n lang="json5">
+{
+  "en": {
+    // @transifexKey component.EntityUpdate.title
+    // This is the title at the top of a pop-up. {label} is the label of an
+    // Entity.
+    "title": "Update {label}",
+    "titleCreate": "Create New Entity",
+    // This is the text of a table column header. "Value" refers to the value of
+    // an Entity property.
+    "header": {
+      "value": "Value"
+    },
+    // @transifexKey component.EntityUpdate.geometryDisabled
+    "geometryDisabled": "Geometry can’t be updated from the map.",
+    "problem": {
+      // @transifexKey component.EntityUpdate.problem.409_15
+      "409_15": "Data has been modified by another user. Please refresh to see the updated data."
+    }
+  }
+}
+</i18n>
diff --git a/test/components/dataset/entities.spec.js b/test/components/dataset/entities.spec.js
index 9c199caa9..1cfcf1811 100644
--- a/test/components/dataset/entities.spec.js
+++ b/test/components/dataset/entities.spec.js
@@ -1,4 +1,5 @@
 import Selectable from '../../../src/components/selectable.vue';
+import EntityCreate from '../../../src/components/entity/create.vue';
 import OdataAnalyze from '../../../src/components/odata/analyze.vue';
 
 import testData from '../../data';
@@ -9,6 +10,19 @@ import { mockLogin } from '../../util/session';
 describe('DatasetEntities', () => {
   beforeEach(mockLogin);
 
+  describe('create modal', () => {
+    beforeEach(() => {
+      testData.extendedDatasets.createPast(1, { name: 'trees' });
+    });
+
+    it('toggles the modal', () =>
+      load('/projects/1/entity-lists/trees/entities', { root: false }).testModalToggles({
+        modal: EntityCreate,
+        show: '#dataset-entities-create-button',
+        hide: '#entity-create .btn-link'
+      }));
+  });
+
   describe('OData modal', () => {
     beforeEach(() => {
       testData.extendedDatasets.createPast(1, { name: 'trees' });
diff --git a/test/components/entity/create.spec.js b/test/components/entity/create.spec.js
new file mode 100644
index 000000000..2f7073750
--- /dev/null
+++ b/test/components/entity/create.spec.js
@@ -0,0 +1,92 @@
+import EntityCreate from '../../../src/components/entity/create.vue';
+
+import testData from '../../data';
+import { mergeMountOptions, mount } from '../../util/lifecycle';
+import { mockHttp } from '../../util/http';
+
+const mountOptions = (options = undefined) => mergeMountOptions(options, {
+  props: { state: true },
+  container: {
+    requestData: { dataset: testData.extendedDatasets.last() }
+  }
+});
+const mountComponent = (options = undefined) =>
+  mount(EntityCreate, mountOptions(options));
+
+describe('EntityCreate', () => {
+  it('shows the correct title', () => {
+    testData.extendedDatasets.createPast(1);
+    const text = mountComponent().get('.modal-title').text();
+    text.should.equal('Create New Entity');
+  });
+
+  it('sends the correct request', () => {
+    testData.extendedDatasets.createPast(1, {
+      name: 'á',
+      properties: [{ name: 'height' }]
+    });
+    return mockHttp()
+      .mount(EntityCreate, mountOptions())
+      .request(async (modal) => {
+        const textareas = modal.findAll('textarea');
+        await textareas[0].setValue('New Label');
+        await textareas[1].setValue('2');
+        return modal.get('form').trigger('submit');
+      })
+      .respondWithProblem()
+      .testRequests([{
+        method: 'POST',
+        url: '/v1/projects/1/datasets/%C3%A1/entities',
+        data: {
+          label: 'New Label',
+          data: Object.assign(Object.create(null), { height: '2' })
+        },
+      }]);
+  });
+
+  it('does not send empty data values', () => {
+    testData.extendedDatasets.createPast(1, {
+      properties: [{ name: 'height' }],
+      entities: 0
+    });
+    return mockHttp()
+      .mount(EntityCreate, mountOptions())
+      .request(async (modal) => {
+        await modal.findAll('textarea')[0].setValue('New Label');
+        return modal.get('form').trigger('submit');
+      })
+      .beforeEachResponse((_, { data }) => {
+        data.should.eql({
+          label: 'New Label',
+          data: Object.create(null)
+        });
+      })
+      .respondWithProblem();
+  });
+
+  it('emits a success event after a successful response', () => {
+    testData.extendedDatasets.createPast(1, {
+      properties: [{ name: 'height' }],
+      entities: 0
+    });
+    return mockHttp()
+      .mount(EntityCreate, mountOptions())
+      .request(async (modal) => {
+        const textareas = modal.findAll('textarea');
+        await textareas[0].setValue('New Label');
+        await textareas[1].setValue('2');
+        return modal.get('form').trigger('submit');
+      })
+      .respondWithData(() => {
+        testData.extendedEntities.createNew({
+          label: 'New Label',
+          data: { height: '2' }
+        });
+        return testData.standardEntities.last();
+      })
+      .afterResponse(modal => {
+        const created = testData.standardEntities.last();
+        modal.emitted('success').should.eql([[created]]);
+      });
+  });
+});
diff --git a/test/components/entity/update.spec.js b/test/components/entity/update.spec.js
index 068f5ca3f..837b0eb85 100644
--- a/test/components/entity/update.spec.js
+++ b/test/components/entity/update.spec.js
@@ -26,10 +26,10 @@ describe('EntityUpdate', () => {
       testData.extendedEntities.createPast(1, { label: 'My Entity' });
     });
 
-    it('renders a row for the label', () => {
+    it('renders a row for the entity label without a label  ', () => {
       const row = mountComponent().getComponent(EntityUpdateRow);
-      row.props().label.should.equal('Entity Label');
       row.props().oldValue.should.equal('My Entity');
+      should.not.exist(row.props().label);
       should.not.exist(row.props().modelValue);
     });
 
@@ -72,16 +72,6 @@ describe('EntityUpdate', () => {
     modal.get('textarea').should.be.focused();
   });
 
-  it('makes width of current and updated values nearly equal', async () => {
-    testData.extendedEntities.createPast(1);
-    const modal = mountComponent({ attachTo: document.body });
-    await modal.vm.$nextTick();
-    const widths = modal.findAll('th.old-value, th.new-value')
-      .map(th => th.element.getBoundingClientRect().width);
-    // The left + right padding of the textarea is 24px.
-    (widths[1] - widths[0]).should.be.within(23.9, 24.1);
-  });
-
   it('resizes the textarea elements', async () => {
     testData.extendedEntities.createPast(1, {
       data: { height: '1' }
diff --git a/test/components/entity/update/row.spec.js b/test/components/entity/update/row.spec.js
index 7d0f89761..6523a7f03 100644
--- a/test/components/entity/update/row.spec.js
+++ b/test/components/entity/update/row.spec.js
@@ -1,8 +1,6 @@
-import EntityUpdate from '../../../../src/components/entity/update.vue';
 import EntityUpdateRow from '../../../../src/components/entity/update/row.vue';
 import TextareaAutosize from '../../../../src/components/textarea-autosize.vue';
 
-import testData from '../../../data';
 import { mergeMountOptions, mount } from '../../../util/lifecycle';
 
 const mountComponent = (options = undefined) =>
@@ -29,31 +27,6 @@ describe('EntityUpdateRow', () => {
     });
   });
 
-  describe('current value', () => {
-    it('shows the value', () => {
-      const row = mountComponent({
-        props: { oldValue: 'foo' }
-      });
-      row.get('.old-value').text().should.equal('foo');
-    });
-
-    it('renders correctly if the value is an empty string', () => {
-      const row = mountComponent({
-        props: { oldValue: '' }
-      });
-      const oldValue = row.get('.old-value');
-      oldValue.text().should.equal('(empty)');
-      oldValue.classes('empty').should.be.true;
-    });
-
-    it('renders correctly if the value is nullish', () => {
-      const row = mountComponent();
-      const oldValue = row.get('.old-value');
-      oldValue.text().should.equal('(empty)');
-      oldValue.classes('empty').should.be.true;
-    });
-  });
-
   describe('textarea value', () => {
     it('initializes the textarea with the current value', () => {
       const row = mountComponent({
@@ -100,11 +73,18 @@ describe('EntityUpdateRow', () => {
       row.emitted('update:modelValue').should.eql([['bar'], [undefined]]);
     });
 
-    it('adds uncommitted-change class if modelValue prop exists', () => {
+    it('adds value-changed class if markValueChanged provided and modelValue prop exists', () => {
+      const row = mountComponent({
+        props: { oldValue: 'foo', modelValue: 'bar', markValueChanged: true }
+      });
+      row.get('.form-group').classes('value-changed').should.be.true;
+    });
+
+    it('does not add value-changed class if markValueChanged not provided but modelValue prop exists', () => {
       const row = mountComponent({
         props: { oldValue: 'foo', modelValue: 'bar' }
       });
-      row.classes('uncommitted-change').should.be.true;
+      row.get('.form-group').classes('value-changed').should.be.false;
     });
   });
 
@@ -123,25 +103,4 @@ describe('EntityUpdateRow', () => {
       row.get('textarea').element.required.should.be.true;
     });
   });
-
-  it('sets TextareaAutosize minHeight prop based on oldValue prop', async () => {
-    testData.extendedEntities.createPast(1, {
-      label: 'a',
-      data: { notes: 'a'.repeat(5000) }
-    });
-    const modal = mount(EntityUpdate, {
-      props: { state: true, entity: testData.extendedEntities.last() },
-      container: {
-        requestData: { dataset: testData.extendedDatasets.last() }
-      },
-      attachTo: document.body
-    });
-    await modal.vm.$nextTick();
-    await modal.vm.$nextTick();
-    const minHeights = modal.findAllComponents(TextareaAutosize)
-      .map(textarea => textarea.props().minHeight);
-    should.exist(minHeights[0]);
-    minHeights[0].should.be.above(0);
-    minHeights[1].should.be.above(minHeights[0]);
-  });
 });
diff --git a/transifex/strings_en.json b/transifex/strings_en.json
index 2d335a4ff..69d799279 100644
--- a/transifex/strings_en.json
+++ b/transifex/strings_en.json
@@ -1621,9 +1621,16 @@
       "upload": {
         "string": "Upload Entities"
       },
+      "new": {
+        "string": "New",
+        "developer_comment": "This is shown on a button for creating new Entities"
+      },
       "alert": {
         "upload": {
           "string": "Your Entities have been successfully uploaded."
+        },
+        "create": {
+          "string": "Entity has been successfully created."
         }
       },
       "purgeDescription": {
@@ -2416,16 +2423,6 @@
         "string": "Update {label}",
         "developer_comment": "This is the title at the top of a pop-up. {label} is the label of an Entity."
       },
-      "header": {
-        "currentValue": {
-          "string": "Current Value",
-          "developer_comment": "This is the text of a table column header. \"Value\" refers to the value of an Entity property."
-        },
-        "updatedValue": {
-          "string": "Updated Value",
-          "developer_comment": "This is the text of a table column header. \"Value\" refers to the value of an Entity property."
-        }
-      },
       "geometryDisabled": {
         "string": "Geometry can’t be updated from the map."
       },
@@ -2557,6 +2554,17 @@
         }
       }
     },
+    "EntityUpsert": {
+      "titleCreate": {
+        "string": "Create New Entity"
+      },
+      "header": {
+        "value": {
+          "string": "Value",
+          "developer_comment": "This is the text of a table column header. \"Value\" refers to the value of an Entity property."
+        }
+      }
+    },
     "EntityVersionLink": {
       "submission": {
         "string": "Submission {instanceName}",