diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerLoader.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerLoader.cs
index 3ca47625ba..aec78a9d70 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerLoader.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerLoader.cs
@@ -218,7 +218,7 @@ namespace CSharpBinding.FormsDesigner
 				ITypeDefinition designerClass = FormsDesignerSecondaryDisplayBinding.GetDesignableClass(primaryParseInfo.UnresolvedFile, compilation, out primaryPart);
 				
 				ISymbol controlSymbol;
-				if (context.IsRootComponent(component))
+				if (DesignerLoaderHost != null && DesignerLoaderHost.RootComponent == component)
 					controlSymbol = designerClass;
 				else
 					controlSymbol = designerClass.GetFields(f => f.Name == oldName, GetMemberOptions.IgnoreInheritedMembers)
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpFormsDesignerLoaderContext.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpFormsDesignerLoaderContext.cs
index fc46f872f1..69dcc9ca30 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpFormsDesignerLoaderContext.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpFormsDesignerLoaderContext.cs
@@ -57,11 +57,6 @@ namespace CSharpBinding.FormsDesigner
 		{
 			viewContent.ShowSourceCode(lineNumber);
 		}
-		
-		public bool IsRootComponent(object component)
-		{
-			return viewContent.Host != null && viewContent.Host.RootComponent == component;
-		}
 	}
 }
 
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/ICSharpDesignerLoaderContext.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/ICSharpDesignerLoaderContext.cs
index 51ac48cbf9..10f70a724e 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/ICSharpDesignerLoaderContext.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/ICSharpDesignerLoaderContext.cs
@@ -16,7 +16,6 @@ namespace CSharpBinding.FormsDesigner
 		CSharpFullParseInformation GetPrimaryFileParseInformation();
 		ICompilation GetCompilation();
 		IDocument GetDocument(FileName fileName);
-		bool IsRootComponent(object component);
 		void ShowSourceCode(int lineNumber = 0);
 	}
 }