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 d412eac229f8..5a3a5474c2df 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
@@ -209,6 +209,16 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase {
     doDoTest(false, false);
   }
 
+  public void testWrongBindingType() throws Exception {
+    configureByFiles(null, getTestName(true) + ".fxml", getTestName(false) + ".java");
+    doDoTest(false, false);
+  }
+
+  public void testAllowIncludeTagInsideDefine() throws Exception {
+    configureByFiles(null, getTestName(true) + ".fxml", "btn.fxml");
+    doDoTest(false, false);
+  }
+
   public void testValueOfAcceptance() 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 e025f13a90c3..a0f4c2578bae 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
@@ -68,6 +68,9 @@ public class JavaFxDefaultPropertyElementDescriptor implements XmlElementDescrip
   public XmlElementDescriptor getElementDescriptor(XmlTag childTag, XmlTag contextTag) {
     final String name = childTag.getName();
     if (myName.equals(FxmlConstants.FX_DEFINE)) {
+      if (name.equals(FxmlConstants.FX_INCLUDE)) {
+        return new JavaFxDefaultPropertyElementDescriptor(name, childTag);
+      }
       return new JavaFxClassBackedElementDescriptor(name, childTag);
     }
 
diff --git a/plugins/javaFX/testData/highlighting/allowIncludeTagInsideDefine.fxml b/plugins/javaFX/testData/highlighting/allowIncludeTagInsideDefine.fxml
new file mode 100644
index 000000000000..f085057ef20f
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/allowIncludeTagInsideDefine.fxml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.*?>
+
+<AnchorPane xmlns:fx="http://javafx.com/fxml">
+  <fx:define>
+    <fx:include source="btn.fxml"/>
+    <fx:include source="<error descr="Cannot resolve file 'btn1.fxml'">btn1.fxml</error>"/>
+  </fx:define>
+</AnchorPane>