diff --git a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs
index c9047ca436..842a623cde 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesignerViewContent.cs
@@ -322,8 +322,6 @@ namespace ICSharpCode.FormsDesigner
 			appDomainHost.AddService(typeof(IHelpService), new HelpService());
 			
 			appDomainHost.AddService(typeof(System.ComponentModel.Design.IResourceService), new DesignerResourceService(this.resourceStore));
-			AmbientProperties ambientProperties = new AmbientProperties();
-			appDomainHost.AddService(typeof(AmbientProperties), ambientProperties);
 			appDomainHost.AddService(typeof(DesignerOptionService), new SharpDevelopDesignerOptionService(options));
 			appDomainHost.AddService(typeof(IProjectResourceService), new ProjectResourceService(ParserService.GetParseInformation(this.DesignerCodeFile.FileName).CompilationUnit.ProjectContent));
 			appDomainHost.AddService(typeof(IImageResourceEditorDialogWrapper), new ImageResourceEditorDialogWrapper(ParserService.GetParseInformation(this.DesignerCodeFile.FileName).CompilationUnit.ProjectContent.Project as IProject));
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesignerAppDomainHost.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesignerAppDomainHost.cs
index 60e1111f08..30b0f3c813 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesignerAppDomainHost.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesignerAppDomainHost.cs
@@ -75,6 +75,7 @@ namespace ICSharpCode.FormsDesigner
 			container.AddService(typeof(ITypeResolutionService), new TypeResolutionService(fileName, container, typeLocator));
 			container.AddService(typeof(ITypeDiscoveryService), new TypeDiscoveryService(gacWrapper, container));
 			container.AddService(typeof(MemberRelationshipService), new DefaultMemberRelationshipService(container));
+			container.AddService(typeof(AmbientProperties), new AmbientProperties());
 			
 			this.designSurface = designSurfaceManager.CreateDesignSurface(container);