diff --git a/src/Main/Base/Project/Src/TextEditor/Commands/ClassMemberMenuBuilder.cs b/src/Main/Base/Project/Src/TextEditor/Commands/ClassMemberMenuBuilder.cs
index c5ca5ae464..1abd1dd8e5 100644
--- a/src/Main/Base/Project/Src/TextEditor/Commands/ClassMemberMenuBuilder.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Commands/ClassMemberMenuBuilder.cs
@@ -75,12 +75,18 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 					list.Add(cmd);
 				} else {
 					if (canGenerateCode) {
-						cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateGetter}", CreateGetter);
-						cmd.Tag = member;
-						list.Add(cmd);
-						cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateProperty}", CreateProperty);
-						cmd.Tag = member;
-						list.Add(cmd);
+						if (member.IsReadonly) {
+							cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateProperty}", CreateGetter);
+							cmd.Tag = member;
+							list.Add(cmd);
+						} else {
+							cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateGetter}", CreateGetter);
+							cmd.Tag = member;
+							list.Add(cmd);
+							cmd = new MenuCommand("${res:SharpDevelop.Refactoring.CreateProperty}", CreateProperty);
+							cmd.Tag = member;
+							list.Add(cmd);
+						}
 					}
 				}
 			}
diff --git a/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs b/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
index 31d7910e70..34e6891852 100644
--- a/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
+++ b/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
@@ -271,6 +271,8 @@ namespace ICSharpCode.Core
 			}
 		}
 		
+		// This is an arbitrary limitation built into the .NET Framework.
+		// Windows supports paths up to 32k length.
 		public static int MaxPathLength = 260;
 		
 		/// <summary>