diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt
index 5a826734b13..d33817f8f51 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt
@@ -55,7 +55,7 @@ public data class UsagesSearchLocation(
         val inCode: Boolean = true,
         val inComments: Boolean = false,
         val inStrings: Boolean = false,
-        val inPlainText: Boolean = false
+        val inPlainText: Boolean = true
 ) {
     class object {
         public val DEFAULT: UsagesSearchLocation = UsagesSearchLocation()
@@ -156,7 +156,7 @@ public class KotlinPsiSearchHelper(private val project: Project): PsiSearchHelpe
     public fun processFilesWithText(item: UsagesSearchRequestItem, consumer: Processor<PsiReference>): Boolean {
         return item.words.all { word ->
             val textProcessor = ResultTextProcessorImpl(item, consumer)
-            processElementsWithWord(textProcessor, item.target.effectiveScope, word, UsageSearchContext.IN_CODE, true)
+            processElementsWithWord(textProcessor, item.target.effectiveScope, word, item.target.location.searchContext, true)
         }
     }
 }
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt
new file mode 100644
index 00000000000..a94b7cd2728
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt
@@ -0,0 +1,13 @@
+// PSI_ELEMENT: org.jetbrains.jet.lang.psi.JetClass
+// OPTIONS: usages
+package server
+
+open class <caret>Server {
+    class object {
+        val NAME = "Server"
+    }
+
+    open fun work() {
+        println("Server")
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.1.xml b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.1.xml
new file mode 100644
index 00000000000..fdc3f984025
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.1.xml
@@ -0,0 +1 @@
+<foo bar="server.Server"></foo>
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt
new file mode 100644
index 00000000000..5d5a3ce5a5b
--- /dev/null
+++ b/idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.results.txt
@@ -0,0 +1 @@
+Unclassified usage (1: 18) <foo bar="server.Server"></foo>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
index 3ec3fe0c409..74aef02c4e6 100644
--- a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
+++ b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
@@ -75,6 +75,7 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu
             public FindUsagesOptions parse(@NotNull String text, @NotNull Project project) {
                 KotlinClassFindUsagesOptions options = new KotlinClassFindUsagesOptions(project);
                 options.isUsages = false;
+                options.isSearchForTextOccurrences = false;
                 options.setSearchConstructorUsages(false);
                 for (String s : InTextDirectivesUtils.findListWithPrefixes(text, "// OPTIONS: ")) {
                     if (parseCommonOptions(options, s)) continue;
@@ -303,7 +304,7 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu
                         if (!name.startsWith(prefix) || name.equals(mainFileName)) return false;
 
                         String ext = name.substring(name.lastIndexOf('.') + 1);
-                        return ext.equals("kt") || ext.equals("java");
+                        return ext.equals("kt") || ext.equals("java") || ext.equals("xml");
                     }
                 }
         );
diff --git a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
index 748104f0c6f..6c8861d09ae 100644
--- a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
@@ -141,6 +141,12 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findClassUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
             }
 
+            @TestMetadata("classUsedInTextAsRef.0.kt")
+            public void testClassUsedInTextAsRef() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/classUsedInTextAsRef.0.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("javaClassAllUsages.0.kt")
             public void testJavaClassAllUsages() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt");