diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextEditorControlBase.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextEditorControlBase.cs
index d4f3a306ae..66fb883038 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextEditorControlBase.cs
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextEditorControlBase.cs
@@ -658,10 +658,10 @@ namespace ICSharpCode.TextEditor
 			}
 			
 			this.FileName = fileName;
-			OptionsChanged();
 			Document.UpdateQueue.Clear();
 			EndUpdate();
 			
+			OptionsChanged();
 			Refresh();
 		}