diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
index ca2df73b466b..c4ec61a4e019 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
@@ -256,6 +256,10 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     doTest();
   }
 
+  public void testRootTagWithImport() throws Exception {
+    doTest();
+  }
+
   public void testReadOnly() throws Exception {
     doTest();
   }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java
index 70fd3c1024e6..2b5542c81bfc 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxDefaultPropertyElementDescriptor.java
@@ -18,7 +18,6 @@ package org.jetbrains.plugins.javaFX.fxml.descriptors;
 import com.intellij.codeInsight.daemon.Validator;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.xml.XmlAttribute;
@@ -220,7 +219,7 @@ public class JavaFxDefaultPropertyElementDescriptor implements XmlElementDescrip
       if (typeAttr != null) {
         final String rootClassName = typeAttr.getValue();
         final Project project = context.getProject();
-        final PsiClass rootClass = rootClassName != null ? JavaPsiFacade.getInstance(project).findClass(rootClassName, GlobalSearchScope.allScope(project)) : null;
+        final PsiClass rootClass = rootClassName != null ?JavaFxPsiUtil.findPsiClass(rootClassName, context) : null;
         if (rootClass != null) {
           return new JavaFxClassBackedElementDescriptor(getName(), rootClass);
         }
diff --git a/plugins/javaFX/testData/highlighting/rootTagWithImport.fxml b/plugins/javaFX/testData/highlighting/rootTagWithImport.fxml
new file mode 100644
index 000000000000..c7f38193eeb9
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/rootTagWithImport.fxml
@@ -0,0 +1,8 @@
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.BorderPane?>
+
+<fx:root type = "BorderPane" minHeight="7" xmlns:fx="http://javafx.com/fxml">
+  <TextField fx:id="textField" text=""/>
+  <Label text="Hello"/>
+</fx:root>
\ No newline at end of file