diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotator.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotator.java
index 2b0524445ee9..fee8d1dad1d5 100644
--- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotator.java
+++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotator.java
@@ -15,6 +15,8 @@
  */
 package com.jetbrains.jsonSchema.impl;
 
+import com.intellij.json.psi.JsonObject;
+import com.intellij.json.psi.JsonProperty;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.AnnotationSession;
 import com.intellij.lang.annotation.Annotator;
@@ -42,7 +44,8 @@ public class JsonSchemaAnnotator implements Annotator {
 
   @Override
   public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
-    if (element.getContainingFile() == null) return;
+    if (element.getContainingFile() == null ||
+        !(element instanceof JsonProperty || element instanceof JsonObject)) return;
 
     final JsonSchemaObject rootSchema =
       JsonSchemaService.Impl.get(element.getProject()).getSchemaObject(element.getContainingFile().getViewProvider().getVirtualFile());
diff --git a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPerformanceTest.java b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPerformanceTest.java
index 22068189a3e5..8937339dba44 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPerformanceTest.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/JsonSchemaPerformanceTest.java
@@ -36,6 +36,6 @@ public class JsonSchemaPerformanceTest extends JsonSchemaHeavyAbstractTest {
         doHighlighting();
       }
     });
-    PlatformTestUtil.startPerformanceTest(getTestName(false), 7000, test).attempts(1).usesAllCPUCores().assertTiming();
+    PlatformTestUtil.startPerformanceTest(getTestName(false), 20000, test).attempts(1).usesAllCPUCores().assertTiming();
   }
 }
diff --git a/json/tests/test/com/jetbrains/jsonSchema/schemaFile/JsonSchemaTestSuite.java b/json/tests/test/com/jetbrains/jsonSchema/schemaFile/JsonSchemaTestSuite.java
index 42e9b78f5386..828a46e54df0 100644
--- a/json/tests/test/com/jetbrains/jsonSchema/schemaFile/JsonSchemaTestSuite.java
+++ b/json/tests/test/com/jetbrains/jsonSchema/schemaFile/JsonSchemaTestSuite.java
@@ -39,6 +39,7 @@ public class JsonSchemaTestSuite extends TestCase {
     suite.addTestSuite(JsonBySchemaHeavyCompletionTest.class);
     suite.addTestSuite(JsonSchemaReadTest.class);
     suite.addTestSuite(JsonSchemaFileResolveTest.class);
+    suite.addTestSuite(JsonSchemaPerformanceTest.class);
     return suite;
   }
 }
\ No newline at end of file