diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs
index 1898aa4f35..b5f192f087 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-
 using ICSharpCode.AvalonEdit.AddIn.MyersDiff;
 using ICSharpCode.AvalonEdit.Document;
 using ICSharpCode.AvalonEdit.Utils;
@@ -23,6 +22,7 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		IDocument baseDocument;
 		IDocumentVersionProvider usedProvider;
 		IDisposable watcher;
+		Core.FileName currentFileName;
 		
 		public event EventHandler ChangeOccurred;
 		
@@ -40,29 +40,32 @@ namespace ICSharpCode.AvalonEdit.AddIn
 		
 		public void Initialize(IDocument document)
 		{
-			if (changeList != null && changeList.Any())
-				return;
+			if (this.document == null) {
+				this.document = document;
+				this.textDocument = (TextDocument)document.GetService(typeof(TextDocument));
+				this.changeList = new CompressingTreeList<LineChangeInfo>((x, y) => x.Equals(y));
+			}
 			
-			this.document = document;
-			this.textDocument = (TextDocument)document.GetService(typeof(TextDocument));
-			this.changeList = new CompressingTreeList<LineChangeInfo>((x, y) => x.Equals(y));
+			var fileName = ((ITextEditor)document.GetService(typeof(ITextEditor))).FileName;
 			
 			InitializeBaseDocument();
+			if (watcher != null)
+				watcher.Dispose();
 			
-			if (usedProvider != null) {
-				string fileName = ((ITextEditor)document.GetService(typeof(ITextEditor))).FileName;
+			if (usedProvider != null)
 				watcher = usedProvider.WatchBaseVersionChanges(fileName, HandleBaseVersionChanges);
-			}
 			
-			SetupInitialFileState(false);
+			SetupInitialFileState(fileName != currentFileName);
+			currentFileName = fileName;
 			
-			this.textDocument.LineTrackers.Add(this);
-			this.textDocument.UndoStack.PropertyChanged += UndoStackPropertyChanged;
+			if (!this.textDocument.LineTrackers.Contains(this)) {
+				this.textDocument.LineTrackers.Add(this);
+				this.textDocument.UndoStack.PropertyChanged += UndoStackPropertyChanged;
+			}
 		}
 		
 		void HandleBaseVersionChanges(object sender, EventArgs e)
 		{
-			ICSharpCode.Core.LoggingService.Info("HandleBaseVersionChanges");
 			InitializeBaseDocument();
 			SetupInitialFileState(true);
 		}
diff --git a/src/AddIns/VersionControl/GitAddIn/Src/GitVersionProvider.cs b/src/AddIns/VersionControl/GitAddIn/Src/GitVersionProvider.cs
index f10b4cf959..56d77ed113 100644
--- a/src/AddIns/VersionControl/GitAddIn/Src/GitVersionProvider.cs
+++ b/src/AddIns/VersionControl/GitAddIn/Src/GitVersionProvider.cs
@@ -185,6 +185,4 @@ namespace ICSharpCode.GitAddIn
 			watcher.ReleaseWatch(HandleChanges);
 		}
 	}
-	
-
 }