diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
index 59cb8fca887..d93a3481107 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -133,7 +133,11 @@ public class JetPsiUtil {
     @Nullable
     public static FqName getFQName(JetNamedDeclaration namedDeclaration) {
         if (namedDeclaration instanceof JetObjectDeclarationName) {
-            JetObjectDeclaration objectDeclaration = PsiTreeUtil.getParentOfType(namedDeclaration, JetObjectDeclaration.class);
+            JetNamedDeclaration objectDeclaration = PsiTreeUtil.getParentOfType(namedDeclaration, JetObjectDeclaration.class);
+            if (objectDeclaration == null) {
+                objectDeclaration = PsiTreeUtil.getParentOfType(namedDeclaration, JetEnumEntry.class);
+            }
+            
             if (objectDeclaration == null) {
                 return null;
             }
diff --git a/idea/testData/editor/optimizeImports/kt2488.kt b/idea/testData/editor/optimizeImports/kt2488.kt
new file mode 100644
index 00000000000..b55d76a5ab2
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/kt2488.kt
@@ -0,0 +1,12 @@
+package test
+
+import test.MyEnum.ONE
+
+fun main(args: Array<String>) {
+    println(ONE)
+}
+
+public enum class MyEnum {
+    ONE
+    TWO
+}
diff --git a/idea/testData/editor/optimizeImports/kt2488_after.kt b/idea/testData/editor/optimizeImports/kt2488_after.kt
new file mode 100644
index 00000000000..b55d76a5ab2
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/kt2488_after.kt
@@ -0,0 +1,12 @@
+package test
+
+import test.MyEnum.ONE
+
+fun main(args: Array<String>) {
+    println(ONE)
+}
+
+public enum class MyEnum {
+    ONE
+    TWO
+}
diff --git a/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsTest.java b/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsTest.java
index cf926c0650f..3d63070f86f 100644
--- a/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/importOptimizer/OptimizeImportsTest.java
@@ -52,6 +52,10 @@ public class OptimizeImportsTest extends LightCodeInsightTestCase {
         doTest();
     }
 
+    public void testKt2488() throws Exception {
+        doTest();
+    }
+
     public void doTest() throws Exception {
         configureByFile(fileName());
         invokeFormatFile();
@@ -100,4 +104,4 @@ public class OptimizeImportsTest extends LightCodeInsightTestCase {
             getProject(), new JetImportOptimizer().processFile(getFile()),
             "Optimize Imports", null, UndoConfirmationPolicy.DO_NOT_REQUEST_CONFIRMATION);
     }
-}
\ No newline at end of file
+}