diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
index 6b7ef9ff347..267bad0022d 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
@@ -75,7 +75,8 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
                              resultSet: CompletionResultSet)
 : CompletionSessionBase(configuration, parameters, resultSet) {
 
-    private val collector: LookupElementsCollector = LookupElementsCollector(prefixMatcher, resolveSession, { isVisibleDescriptor(it) })
+    private val collector = LookupElementsCollector(prefixMatcher, resolveSession, { isVisibleDescriptor(it) })
+    private var anythingAdded = false
 
     private val project = position.getProject()
     private val indicesHelper = KotlinIndicesHelper(project)
@@ -85,16 +86,10 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
     public fun complete(): Boolean {
         assert(parameters.getCompletionType() == CompletionType.BASIC)
 
-        collectElements()
-
-        collector.flushToResultSet(resultSet)
-
-        return !collector.isEmpty
-    }
-
-    private fun collectElements() {
         if (!NamedParametersCompletion.isOnlyNamedParameterExpected(position)) {
-            if (jetReference != null && !isOnlyKeywordCompletion()) {
+            val completeReference = jetReference != null && !isOnlyKeywordCompletion()
+
+            if (completeReference) {
                 if (shouldRunOnlyTypeCompletion()) {
                     if (configuration.completeNonImportedDeclarations) {
                         TypesCompletion(parameters, resolveSession, prefixMatcher).addAllTypes(collector)
@@ -106,15 +101,27 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
                 }
                 else {
                     addReferenceVariants()
-
-                    addNonImported()
                 }
             }
 
             KeywordCompletion().complete(parameters, collector)
+
+            if (completeReference && !shouldRunOnlyTypeCompletion()) {
+                addNonImported()
+            }
         }
 
         NamedParametersCompletion.complete(position, collector)
+
+        flushToResultSet()
+        return anythingAdded
+    }
+
+    private fun flushToResultSet() {
+        if (!collector.isEmpty) {
+            anythingAdded = true
+        }
+        collector.flushToResultSet(resultSet)
     }
 
     private fun addNonImported() {
@@ -127,6 +134,8 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
             if (PsiTreeUtil.getParentOfType(jetReference!!.expression, javaClass<JetDotQualifiedExpression>()) == null) return
         }
 
+        flushToResultSet()
+
         if (shouldRunTopLevelCompletion()) {
             TypesCompletion(parameters, resolveSession, prefixMatcher).addAllTypes(collector)
             addKotlinTopLevelDeclarations()
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt
index 0d155124d46..c2cbf34a0cd 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt
@@ -36,6 +36,7 @@ class LookupElementsCollector(private val prefixMatcher: PrefixMatcher,
 
     public fun flushToResultSet(resultSet: CompletionResultSet) {
         resultSet.addAllElements(elements)
+        elements.clear()
     }
 
     public val isEmpty: Boolean