diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 15d450fcb..c7584f01e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.7.18
  - fixed #10789: Inbox message states not deleted when a user is deleted
+ - fixed #10790: Data Form doesn't always auto-commit version tags
  - fixed #10739: Textarea and Codearea resize don't work in IE or Webkit browsers
  - fixed #10552: Map: Editing map properties resets zoom level to 0
  - fixed #10758: CS #replies does not get updated after post restore from trash (Bart Jol / Procolix)
diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm
index 8151416d8..6fc73f631 100644
--- a/lib/WebGUI/Asset/Wobject/DataForm.pm
+++ b/lib/WebGUI/Asset/Wobject/DataForm.pm
@@ -1582,12 +1582,11 @@ sub www_editFieldSave {
         $newSelf->createField($newName, \%field);
     }
 
-
+    WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
     if ($form->process("proceed") eq "editField") {
         return $newSelf->www_editField('new');
     }
     $newSelf->{_mode} = 'form';
-    WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
     return $newSelf->www_view;
 }