diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/CurrentLineHighlightRenderer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/CurrentLineHighlightRenderer.cs
index 62a92f5c45..4a3204ef26 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/CurrentLineHighlightRenderer.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/CurrentLineHighlightRenderer.cs
@@ -29,17 +29,13 @@ namespace ICSharpCode.AvalonEdit.Rendering
 		public int Line {
 			get { return this.Line; } 
 			set {
-				if (this.line != line) {
+				if (this.line != value) {
 					this.line = value;
 					this.textView.InvalidateLayer(this.Layer);
 				}
 			}
 		}
 		
-		public bool Enabled {
-			get; set;
-		}
-		
 		public KnownLayer Layer
 		{
 			get { return KnownLayer.Selection; }
@@ -74,7 +70,7 @@ namespace ICSharpCode.AvalonEdit.Rendering
 		
 		public void Draw(TextView textView, DrawingContext drawingContext)
 		{
-			if(!Enabled)
+			if(!this.textView.Options.HighlightCurrentLine)
 				return;
 			
 			BackgroundGeometryBuilder builder = new BackgroundGeometryBuilder();
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs
index 1ef2cee6b6..848acb9c87 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs
@@ -211,8 +211,6 @@ namespace ICSharpCode.AvalonEdit.Rendering
 			else
 				columnRulerRenderer.SetRuler(-1, ColumnRulerPen);
 			
-			currentLineHighlighRenderer.Enabled = Options.HighlightCurrentLine;
-			
 			UpdateBuiltinElementGeneratorsFromOptions();
 			Redraw();
 		}