diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
index 81282a6978..3c233159de 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
@@ -67,5 +67,8 @@
 		<CustomTool id    = "ResXFileCodeGenerator"
 		            class = "ResourceEditor.ResourceCodeGeneratorTool"
 		            fileNamePattern = "\.res(x|ources)$"/>
+		<CustomTool id    = "PublicResXFileCodeGenerator"
+		            class = "ResourceEditor.PublicResourceCodeGeneratorTool"
+		            fileNamePattern = "\.res(x|ources)$"/>
 	</Path>
 </AddIn>
diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceCodeGeneratorTool.cs b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceCodeGeneratorTool.cs
index 57baf2bf8b..fa9a6364da 100644
--- a/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceCodeGeneratorTool.cs
+++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceCodeGeneratorTool.cs
@@ -16,6 +16,8 @@ namespace ResourceEditor
 {
 	public class ResourceCodeGeneratorTool : ICustomTool
 	{
+		protected bool createInternalClass = true;
+		
 		public void GenerateCode(FileProjectItem item, CustomToolContext context)
 		{
 			/*context.GenerateCodeDomAsync(item, context.GetOutputFileName(item, ".Designer"),
@@ -48,11 +50,17 @@ namespace ResourceEditor
 					context.OutputNamespace, // generatedCodeNamespace
 					context.OutputNamespace, // resourcesNamespace
 					context.Project.LanguageProperties.CodeDomProvider, // codeProvider
-					true,             // internal class
+					createInternalClass,             // internal class
 					out unmatchable
 				));
 		}
-		
-		
+	}
+	
+	public class PublicResourceCodeGeneratorTool : ResourceCodeGeneratorTool
+	{
+		public PublicResourceCodeGeneratorTool()
+		{
+			base.createInternalClass = false;
+		}
 	}
 }