diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
index 7daa7a2db95..dd9f3e6fbcb 100644
--- a/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
+++ b/idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
@@ -26,6 +26,7 @@ import com.intellij.psi.PsiMethod;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiShortNamesCache;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.Processor;
 import com.intellij.util.containers.HashSet;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -207,6 +208,11 @@ public class JetShortNamesCache extends PsiShortNamesCache {
         return new PsiMethod[0];
     }
 
+    @Override
+    public boolean processMethodsWithName(@NonNls @NotNull String name, @NotNull GlobalSearchScope scope, @NotNull Processor<PsiMethod> processor) {
+        return false;
+    }
+
     @NotNull
     @Override
     public String[] getAllMethodNames() {
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java
index 6a5fc57ac16..9fed3b377e5 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportClassAndFunFix.java
@@ -153,10 +153,13 @@ public class ImportClassAndFunFix extends JetHintAction<JetSimpleNameExpression>
         if (project == null) {
             return false;
         }
-        
-        String hintText = ShowAutoImportPass.getMessage(suggestions.size() > 1, suggestions.get(0));
-        if (!ApplicationManager.getApplication().isUnitTestMode() &&
-                !HintManager.getInstance().hasShownHintsThatWillHideByOtherHint()) {
+
+        if (HintManager.getInstance().hasShownHintsThatWillHideByOtherHint(true)) {
+            return false;
+        }
+
+        if (!ApplicationManager.getApplication().isUnitTestMode()) {
+            String hintText = ShowAutoImportPass.getMessage(suggestions.size() > 1, suggestions.get(0));
 
             HintManager.getInstance().showQuestionHint(
                     editor, hintText,