diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
index 2f15f4bc0c..f5641c67b0 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditor.cs
@@ -285,13 +285,16 @@ namespace ICSharpCode.AvalonEdit.AddIn
 					this.Encoding = reader.CurrentEncoding;
 				}
 			}
-			primaryTextEditor.IsModified = false;
 			NewLineConsistencyCheck.StartConsistencyCheck(this);
 		}
 		
 		public void Save(Stream stream)
 		{
-			primaryTextEditor.Save(stream);
+			// don't use TextEditor.Save here because that would touch the Modified flag,
+			// but OpenedFile is already managing IsDirty
+			using (StreamWriter writer = new StreamWriter(stream, primaryTextEditor.Encoding ?? Encoding.UTF8)) {
+				writer.Write(primaryTextEditor.Text);
+			}
 		}
 		
 		void OnSplitView(object sender, ExecutedRoutedEventArgs e)