diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextAreaControl.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextAreaControl.cs
index dafcc852e0..40be23286a 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextAreaControl.cs
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextAreaControl.cs
@@ -263,6 +263,8 @@ namespace ICSharpCode.TextEditor
 					hRuler = new HRuler(textArea);
 					Controls.Add(hRuler);
 					ResizeTextArea();
+				} else {
+					hRuler.Invalidate();
 				}
 			} else {
 				if (hRuler != null) {
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs
index aadbbe8f05..0cd760a1ae 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextView.cs
@@ -666,7 +666,8 @@ namespace ICSharpCode.TextEditor
 			return width;
 		}
 		
-		const TextFormatFlags textFormatFlags = TextFormatFlags.NoPadding | TextFormatFlags.NoPrefix;
+		const TextFormatFlags textFormatFlags =
+			TextFormatFlags.NoPadding | TextFormatFlags.NoPrefix | TextFormatFlags.PreserveGraphicsClipping;
 		#endregion
 		
 		#region Conversion Functions