diff --git a/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt
index 51eba98d146..58fed65683f 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/SmartCompletion.kt
@@ -79,6 +79,9 @@ fun buildSmartCompletionData(expression: JetSimpleNameExpression, resolveSession
             }
             return returnType.toList()
         }
+        else if (descriptor is ClassDescriptor && descriptor.getKind() == ClassKind.ENUM_ENTRY) {
+            return descriptor.getDefaultType().toList()
+        }
         else {
             return listOf()
         }
diff --git a/idea/testData/completion/smart/JavaEnumMembersAfterQualifier.kt b/idea/testData/completion/smart/JavaEnumMembersAfterQualifier.kt
new file mode 100644
index 00000000000..95e6869bc17
--- /dev/null
+++ b/idea/testData/completion/smart/JavaEnumMembersAfterQualifier.kt
@@ -0,0 +1,8 @@
+import java.lang.annotation.ElementType
+
+fun foo(){
+    val e : ElementType = ElementType.<caret>
+}
+
+// EXIST: { lookupString:"TYPE", itemText:"TYPE", tailText:" (java.lang.annotation.ElementType)" }
+// EXIST: { lookupString:"FIELD", itemText:"FIELD", tailText:" (java.lang.annotation.ElementType)" }
diff --git a/idea/tests/org/jetbrains/jet/completion/JetSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JetSmartCompletionTestGenerated.java
index 6518c69d089..8c4af0f11da 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetSmartCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetSmartCompletionTestGenerated.java
@@ -106,6 +106,11 @@ public class JetSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
         doTest("idea/testData/completion/smart/JavaEnumMembers.kt");
     }
     
+    @TestMetadata("JavaEnumMembersAfterQualifier.kt")
+    public void testJavaEnumMembersAfterQualifier() throws Exception {
+        doTest("idea/testData/completion/smart/JavaEnumMembersAfterQualifier.kt");
+    }
+    
     @TestMetadata("JavaEnumMembersForNullable.kt")
     public void testJavaEnumMembersForNullable() throws Exception {
         doTest("idea/testData/completion/smart/JavaEnumMembersForNullable.kt");