diff --git a/apps/home/static/home/js/tables.js b/apps/home/static/home/js/tables.js
index cd67723..3b5dcbe 100644
--- a/apps/home/static/home/js/tables.js
+++ b/apps/home/static/home/js/tables.js
@@ -347,6 +347,7 @@ function setTableControlsUsability(tableId, disabled) {
 async function openDataModal(modalId, pk, url) {
     $modal = $(modalId);
     $modal.data("primary-key", pk);
+    clearValidation($modal);
 
     if (parseInt(pk) === -1) {
         $modal.find(".form-create").show();
@@ -388,7 +389,6 @@ function clearValidation($modal) {
 }
 
 async function loadModalData($modal, url) {
-    clearValidation($modal);
     const data = await ajaxRequest(url, "GET");
 
     $modal.find("[data-field]").each(function() {
@@ -450,8 +450,8 @@ async function onModalSubmit($modal, $table, url) {
 
     ajaxRequest(url, method, formData)
         .then(response => {
-            $modal.modal("hide");
             $table.trigger("doDataLoad");
+            $modal.modal("hide");
         })
         .catch(error => {
             logError(error);