diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs
index e2160b14af..fc6d30b1e7 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryASTConvertVisitor.cs
@@ -183,7 +183,13 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
 			}
 			currentNamespace = new DefaultUsingScope();
 			if (!string.IsNullOrEmpty(VBRootNamespace)) {
-				currentNamespace.NamespaceName = VBRootNamespace;
+				foreach (string name in VBRootNamespace.Split('.')) {
+					currentNamespace = new DefaultUsingScope {
+						Parent = currentNamespace,
+						NamespaceName = PrependCurrentNamespace(name),
+					};
+					currentNamespace.Parent.ChildScopes.Add(currentNamespace);
+				}
 			}
 			cu.UsingScope = currentNamespace;
 			compilationUnit.AcceptChildren(this, data);
diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs
index 564248f82c..a966cfc278 100644
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/DefaultProjectContent.cs
@@ -791,7 +791,6 @@ namespace ICSharpCode.SharpDevelop.Dom
 				if (string.IsNullOrEmpty(usingScope.NamespaceName)) {
 					// Try if name is already the full type name
 					fullname = name;
-					lookedForFullTypeName = true;
 				} else {
 					fullname = usingScope.NamespaceName + "." + name;
 				}