diff --git a/atsynedit/atsynedit.pas b/atsynedit/atsynedit.pas
index f5d2bcb2c..0475f52b7 100644
--- a/atsynedit/atsynedit.pas
+++ b/atsynedit/atsynedit.pas
@@ -4076,13 +4076,16 @@ procedure TATSynEdit.SaveToFile(const AFilename: string);
 
   if FOptSavingForceFinalEol then
     Change1:= Strings.ActionEnsureFinalEol;
+
   if FOptSavingTrimSpaces then
     Change2:= Strings.ActionTrimSpaces(cTrimRight);
+
   if FOptSavingTrimFinalEmptyLines then
+  begin
     Change3:= Strings.ActionTrimFinalEmptyLines;
-
-  if Change3 then
-    DoCaretsFixIncorrectPos(false);
+    if Change3 then
+      DoCaretsFixIncorrectPos(false);
+  end;
 
   if Change1 or Change2 or Change3 then
   begin
@@ -4092,8 +4095,6 @@ procedure TATSynEdit.SaveToFile(const AFilename: string);
 
   Strings.SaveToFile(AFilename);
   Modified:= false;
-  DoEventState; //modified
-  Update;
 end;