diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx
index 330a94cd35..857df5d569 100644
--- a/data/resources/StringResources.resx
+++ b/data/resources/StringResources.resx
@@ -2397,6 +2397,9 @@ system. I don't think that it needs translation.</comment>
   <data name="Dialog.Options.IDEOptions.TextEditor.General.MouseWheelZoomCheckBoxCheckBox" xml:space="preserve">
     <value>M&amp;ouse wheel zooming</value>
   </data>
+  <data name="Dialog.Options.IDEOptions.TextEditor.General.HideCursorWhileTypingCheckBoxCheckBox" xml:space="preserve">
+    <value>Hide cursor while typing</value>
+  </data>
   <data name="Dialog.Options.IDEOptions.TextEditor.General.ShowQuickClassBrowserCheckBox" xml:space="preserve">
     <value>Show &amp;Quick ClassBrowser Panel</value>
   </data>
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/BehaviorOptions.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/BehaviorOptions.xaml
index 44fb075db0..1fe606588a 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/BehaviorOptions.xaml
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/BehaviorOptions.xaml
@@ -33,6 +33,9 @@
 				<CheckBox
 					IsChecked="{core:OptionBinding local:CodeEditorOptions.MouseWheelZoom}"
 					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.MouseWheelZoomCheckBoxCheckBox}" />
+				<CheckBox
+					IsChecked="{core:OptionBinding local:CodeEditorOptions.HideCursorWhileTyping}"
+					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.HideCursorWhileTypingCheckBoxCheckBox}" />
 				<CheckBox
 					IsChecked="{core:OptionBinding local:CodeEditorOptions.CutCopyWholeLine}"
 					Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Behaviour.CutCopyWholeLine}" />
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
index 2e5dcf8aba..f1be1f0bae 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
@@ -1009,7 +1009,7 @@ namespace ICSharpCode.AvalonEdit.Editing
 		}
 		
 		void HideMouseCursor() {
-			if (!this.isMouseCursorHidden && this.IsMouseOver) {	
+			if (Options.HideCursorWhileTyping && !this.isMouseCursorHidden && this.IsMouseOver) {	
 				this.isMouseCursorHidden = true;
 				System.Windows.Forms.Cursor.Hide();
 			}
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs
index 6d4129dbcc..152b02992b 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs
@@ -434,7 +434,7 @@ namespace ICSharpCode.AvalonEdit
 		bool highlightCurrentLine = false;
 		
 		/// <summary>
-		/// Gets/Sets whether current line should be shown.
+		/// Gets/Sets if current line should be shown.
 		/// </summary>
 		[DefaultValue(false)]
 		public virtual bool HighlightCurrentLine {
@@ -446,5 +446,21 @@ namespace ICSharpCode.AvalonEdit
 				}
 			}
 		}
+		
+		bool hideCursorWhileTyping = true;
+		
+		[DefaultValue(true)]
+		/// <summary>
+		/// Gets/Sets if mouse cursor should be shown when user is typing
+		/// </summary>
+		public bool HideCursorWhileTyping {
+			get { return hideCursorWhileTyping; }
+			set {
+				if (hideCursorWhileTyping != value) {
+					hideCursorWhileTyping = value;
+					OnPropertyChanged("HideCursorWhileTyping");
+				}
+			}
+		}
 	}
 }