diff --git a/components/jujiboutils/jujibo-utils/src/jdbcurrencyedit.pas b/components/jujiboutils/jujibo-utils/src/jdbcurrencyedit.pas
index b83fc45f9..56b298655 100644
--- a/components/jujiboutils/jujibo-utils/src/jdbcurrencyedit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdbcurrencyedit.pas
@@ -387,7 +387,8 @@ end;
 procedure TJDBCurrencyEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;
 
 end.
diff --git a/components/jujiboutils/jujibo-utils/src/jdbdateedit.pas b/components/jujiboutils/jujibo-utils/src/jdbdateedit.pas
index 48c62b0f2..190c68cdd 100644
--- a/components/jujiboutils/jujibo-utils/src/jdbdateedit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdbdateedit.pas
@@ -146,10 +146,10 @@ procedure TJDBDateEdit.DataChange(Sender: TObject);
 begin
   if FDataLink.Field <> nil then
   begin
-  if not Focused then
-    formatInput
-  else
-    Caption := FDataLink.Field.AsString;
+    if not Focused then
+      formatInput
+    else
+      Caption := FDataLink.Field.AsString;
   end
   else
     Text := '';
@@ -345,7 +345,8 @@ end;
 procedure TJDBDateEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;
 
 end.
diff --git a/components/jujiboutils/jujibo-utils/src/jdbintegeredit.pas b/components/jujiboutils/jujibo-utils/src/jdbintegeredit.pas
index ea8be78f7..c23e4b380 100644
--- a/components/jujiboutils/jujibo-utils/src/jdbintegeredit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdbintegeredit.pas
@@ -344,7 +344,8 @@ end;
 procedure TJDBIntegerEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;
 
 end.
diff --git a/components/jujiboutils/jujibo-utils/src/jdblabeledcurrencyedit.pas b/components/jujiboutils/jujibo-utils/src/jdblabeledcurrencyedit.pas
index b4cbf888d..c899bc756 100644
--- a/components/jujiboutils/jujibo-utils/src/jdblabeledcurrencyedit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdblabeledcurrencyedit.pas
@@ -383,7 +383,8 @@ end;
 procedure TJDBLabeledCurrencyEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;
 
 end.
diff --git a/components/jujiboutils/jujibo-utils/src/jdblabeleddateedit.pas b/components/jujiboutils/jujibo-utils/src/jdblabeleddateedit.pas
index 9a7b7a6f4..3e8b5b2f5 100644
--- a/components/jujiboutils/jujibo-utils/src/jdblabeleddateedit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdblabeleddateedit.pas
@@ -350,7 +350,8 @@ end;
 procedure TJDBLabeledDateEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;
 
 end.
diff --git a/components/jujiboutils/jujibo-utils/src/jdblabelededit.pas b/components/jujiboutils/jujibo-utils/src/jdblabelededit.pas
index 73cc613aa..b08c9675a 100644
--- a/components/jujiboutils/jujibo-utils/src/jdblabelededit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdblabelededit.pas
@@ -281,7 +281,8 @@ end;
 procedure TJDBLabeledEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;
 
 end.
diff --git a/components/jujiboutils/jujibo-utils/src/jdblabeledintegeredit.pas b/components/jujiboutils/jujibo-utils/src/jdblabeledintegeredit.pas
index fbb642947..57a801e2f 100644
--- a/components/jujiboutils/jujibo-utils/src/jdblabeledintegeredit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdblabeledintegeredit.pas
@@ -340,7 +340,8 @@ end;
 procedure TJDBLabeledIntegerEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;
 
 end.
diff --git a/components/jujiboutils/jujibo-utils/src/jdblabeledtimeedit.pas b/components/jujiboutils/jujibo-utils/src/jdblabeledtimeedit.pas
index e749f2424..1a89344d0 100644
--- a/components/jujiboutils/jujibo-utils/src/jdblabeledtimeedit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdblabeledtimeedit.pas
@@ -134,7 +134,6 @@ begin
     theValue := NormalizeTime(Text, FDataLink.Field.AsDateTime);
     if Text = '' then
     begin
-      Field.DataSet.Edit;
       Field.Value := Null;
     end
     else
@@ -318,7 +317,8 @@ end;
 procedure TJDBLabeledTimeEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;
 
 end.
diff --git a/components/jujiboutils/jujibo-utils/src/jdbtimeedit.pas b/components/jujiboutils/jujibo-utils/src/jdbtimeedit.pas
index fe6be2d90..4a4ab5a60 100644
--- a/components/jujiboutils/jujibo-utils/src/jdbtimeedit.pas
+++ b/components/jujiboutils/jujibo-utils/src/jdbtimeedit.pas
@@ -142,7 +142,6 @@ begin
     theValue := NormalizeTime(Text, FDataLink.Field.AsDateTime);
     if Text = '' then
     begin
-      Field.DataSet.Edit;
       Field.Value := Null;
     end
     else
@@ -325,7 +324,8 @@ end;
 procedure TJDBTimeEdit.EditingDone;
 begin
   inherited EditingDone;
-  UpdateData(self);
+  if DataSource.State in [dsEdit, dsInsert] then
+    UpdateData(self);
 end;