diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 356eb811ad8..b8ac9d358f8 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -184,6 +184,8 @@
 
       <psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.JetCodeBlockModificationListener"/>
 
+      <referencesSearch implementation="org.jetbrains.jet.plugin.references.KotlinReferencesSearcher"/>
+
       <toolWindow id="Kotlin"
                   factoryClass="org.jetbrains.jet.plugin.internal.KotlinInternalToolWindowFactory"
                   anchor="right"
diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindClassUsagesHandler.java b/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindClassUsagesHandler.java
index beaa26bd28d..d0bd3cafd5c 100644
--- a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindClassUsagesHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindClassUsagesHandler.java
@@ -19,8 +19,6 @@ package org.jetbrains.jet.plugin.findUsages;
 import com.intellij.find.findUsages.FindUsagesHandler;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.asJava.JetLightClass;
-import org.jetbrains.jet.lang.psi.JetClass;
 
 /**
  * @author yole
@@ -29,10 +27,4 @@ public class KotlinFindClassUsagesHandler extends FindUsagesHandler {
     public KotlinFindClassUsagesHandler(@NotNull PsiElement psiElement) {
         super(psiElement);
     }
-
-    @NotNull
-    @Override
-    public PsiElement[] getSecondaryElements() {
-        return new PsiElement[] {JetLightClass.wrapDelegate((JetClass) getPsiElement()) };
-    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindFunctionUsagesHandler.java b/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindFunctionUsagesHandler.java
index 3412b5198a6..4e189dc24be 100644
--- a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindFunctionUsagesHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindFunctionUsagesHandler.java
@@ -18,11 +18,7 @@ package org.jetbrains.jet.plugin.findUsages;
 
 import com.intellij.find.findUsages.FindUsagesHandler;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiMethod;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.asJava.JetLightClass;
-import org.jetbrains.jet.lang.psi.JetClassBody;
-import org.jetbrains.jet.lang.psi.JetFunction;
 
 /**
  * @author yole
@@ -31,17 +27,4 @@ public class KotlinFindFunctionUsagesHandler extends FindUsagesHandler {
     protected KotlinFindFunctionUsagesHandler(@NotNull PsiElement psiElement) {
         super(psiElement);
     }
-
-    @NotNull
-    @Override
-    public PsiElement[] getSecondaryElements() {
-        JetFunction function = (JetFunction) getPsiElement();
-        if (function.getParent() instanceof JetClassBody) {
-            final PsiMethod method = JetLightClass.wrapMethod(function);
-            if (method != null) {
-                return new PsiElement[] { method };
-            }
-        }
-        return PsiElement.EMPTY_ARRAY;
-    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java
index 8f4355e77c3..ba6105d5499 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java
@@ -18,18 +18,11 @@ package org.jetbrains.jet.plugin.refactoring.rename;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiReference;
-import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.refactoring.rename.RenamePsiElementProcessor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.asJava.JetLightClass;
-import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetClassOrObject;
 import org.jetbrains.jet.lang.psi.JetFile;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -42,18 +35,6 @@ public class RenameJetClassProcessor extends RenamePsiElementProcessor {
         return element instanceof JetClassOrObject;
     }
 
-    @NotNull
-    @Override
-    public Collection<PsiReference> findReferences(PsiElement element) {
-        if (element instanceof JetClass) {
-            List<PsiReference> references = new ArrayList<PsiReference>();
-            references.addAll(ReferencesSearch.search(element).findAll());
-            references.addAll(ReferencesSearch.search(JetLightClass.wrapDelegate((JetClass) element)).findAll());
-            return references;
-        }
-        return super.findReferences(element);
-    }
-
     @Override
     public void prepareRenaming(PsiElement element, String newName, Map<PsiElement, String> allRenames) {
         JetClassOrObject clazz = (JetClassOrObject) element;
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.java
index 9528f4487cd..c819b4d8bd8 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.java
@@ -52,16 +52,4 @@ public class RenameKotlinFunctionProcessor extends RenamePsiElementProcessor {
         }
         return super.substituteElementToRename(element, editor);
     }
-
-    @NotNull
-    @Override
-    public Collection<PsiReference> findReferences(PsiElement element) {
-        if (element instanceof JetFunction) {
-            List<PsiReference> references = new ArrayList<PsiReference>();
-            references.addAll(ReferencesSearch.search(element).findAll());
-            references.addAll(ReferencesSearch.search(JetLightClass.wrapMethod((JetFunction) element)).findAll());
-            return references;
-        }
-        return super.findReferences(element);
-    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/references/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/references/KotlinReferencesSearcher.java
new file mode 100644
index 00000000000..149b0b44428
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/references/KotlinReferencesSearcher.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.references;
+
+import com.intellij.openapi.application.QueryExecutorBase;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.search.searches.ReferencesSearch;
+import com.intellij.util.Processor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.asJava.JetLightClass;
+import org.jetbrains.jet.lang.psi.JetClass;
+import org.jetbrains.jet.lang.psi.JetClassBody;
+import org.jetbrains.jet.lang.psi.JetFunction;
+
+/**
+ * @author yole
+ */
+public class KotlinReferencesSearcher extends QueryExecutorBase<PsiReference, ReferencesSearch.SearchParameters> {
+    @Override
+    public void processQuery(@NotNull ReferencesSearch.SearchParameters queryParameters, @NotNull Processor<PsiReference> consumer) {
+        PsiElement element = queryParameters.getElementToSearch();
+        if (element instanceof JetClass) {
+            String className = ((JetClass) element).getName();
+            if (className != null) {
+                queryParameters.getOptimizer().searchWord(className, queryParameters.getScope(),
+                                                          true, JetLightClass.wrapDelegate((JetClass) element));
+            }
+        }
+        else if (element instanceof JetFunction) {
+            final JetFunction function = (JetFunction) element;
+            final String name = function.getName();
+            if (function.getParent() instanceof JetClassBody && name != null) {
+                final PsiMethod method = JetLightClass.wrapMethod(function);
+                if (method != null) {
+                    queryParameters.getOptimizer().searchWord(name, queryParameters.getScope(),
+                                                              true, JetLightClass.wrapMethod((JetFunction) element));
+                }
+            }
+
+        }
+    }
+}