diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
index 62777689e80..7709faf1fb9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
@@ -75,6 +75,15 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<PsiJetObjectSt
         return JetPsiUtil.getFQName(this);
     }
 
+    public boolean isTopLevel() {
+        PsiJetObjectStub stub = getStub();
+        if (stub != null) {
+            return stub.isTopLevel();
+        }
+
+        return getParent() instanceof JetFile;
+    }
+
     @Override
     public PsiElement getNameIdentifier() {
         JetObjectDeclarationName nameAsDeclaration = getNameAsDeclaration();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetObjectStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetObjectStub.java
index c7b264dc204..faae13537b0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetObjectStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetObjectStub.java
@@ -27,4 +27,5 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 public interface PsiJetObjectStub extends NamedStub<JetObjectDeclaration> {
     @Nullable
     FqName getFQName();
+    boolean isTopLevel();
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java
index 6b9d4210a7a..df080c3d698 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetFileElementType.java
@@ -38,7 +38,7 @@ import java.io.IOException;
  * @author Nikolay Krasko
  */
 public class JetFileElementType extends IStubFileElementType<PsiJetFileStub> {
-    public static final int STUB_VERSION = 17;
+    public static final int STUB_VERSION = 18;
 
     public JetFileElementType() {
         super("jet.FILE", JetLanguage.INSTANCE);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java
index 873cc84e5a2..71234e88a41 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java
@@ -69,7 +69,7 @@ public class JetObjectElementType extends JetStubElementType<PsiJetObjectStub, J
         assert name != null;
 
         FqName fqName = psi.getFqName();
-        return new PsiJetObjectStubImpl(JetStubElementTypes.OBJECT_DECLARATION, parentStub, name, fqName);
+        return new PsiJetObjectStubImpl(JetStubElementTypes.OBJECT_DECLARATION, parentStub, name, fqName, psi.isTopLevel());
     }
 
     @Override
@@ -77,6 +77,7 @@ public class JetObjectElementType extends JetStubElementType<PsiJetObjectStub, J
         dataStream.writeName(stub.getName());
         FqName fqName = stub.getFQName();
         dataStream.writeName(fqName != null ? fqName.toString() : null);
+        dataStream.writeBoolean(stub.isTopLevel());
     }
 
     @Override
@@ -84,8 +85,9 @@ public class JetObjectElementType extends JetStubElementType<PsiJetObjectStub, J
         StringRef name = dataStream.readName();
         StringRef fqNameStr = dataStream.readName();
         FqName fqName = fqNameStr != null ? new FqName(fqNameStr.toString()) : null;
+        boolean isTopLevel = dataStream.readBoolean();
 
-        return new PsiJetObjectStubImpl(JetStubElementTypes.OBJECT_DECLARATION, parentStub, name, fqName);
+        return new PsiJetObjectStubImpl(JetStubElementTypes.OBJECT_DECLARATION, parentStub, name, fqName, isTopLevel);
     }
 
     @Override
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java
index a93482ef083..4540d704566 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java
@@ -32,24 +32,28 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 public class PsiJetObjectStubImpl extends StubBase<JetObjectDeclaration> implements PsiJetObjectStub {
     private final StringRef name;
     private final FqName fqName;
+    private final boolean isTopLevel;
 
     public PsiJetObjectStubImpl(
             @NotNull IStubElementType elementType,
             @NotNull StubElement parent,
             @NotNull String name,
-            @Nullable FqName fqName) {
-        this(elementType, parent, StringRef.fromString(name), fqName);
+            @Nullable FqName fqName,
+            boolean isTopLevel) {
+        this(elementType, parent, StringRef.fromString(name), fqName, isTopLevel);
     }
 
     public PsiJetObjectStubImpl(
             @NotNull IStubElementType elementType,
             @NotNull StubElement parent,
             @NotNull StringRef name,
-            @Nullable FqName fqName) {
+            @Nullable FqName fqName,
+            boolean isTopLevel) {
         super(parent, elementType);
 
         this.name = name;
         this.fqName = fqName;
+        this.isTopLevel = isTopLevel;
     }
 
     @Override
@@ -63,13 +67,22 @@ public class PsiJetObjectStubImpl extends StubBase<JetObjectDeclaration> impleme
         return fqName;
     }
 
+    @Override
+    public boolean isTopLevel() {
+        return isTopLevel;
+    }
+
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
 
         builder.append("PsiJetObjectStubImpl[");
-        builder.append("name=").append(getName());
 
+        if (isTopLevel) {
+            builder.append("top ");
+        }
+
+        builder.append("name=").append(getName());
         builder.append(" fqName=").append(fqName != null ? fqName.toString() : "null");
         builder.append("]");
 
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index cd618830a11..92ad4281474 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -204,6 +204,7 @@
       <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionsFqnNameIndex" />
       <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertiesFqnNameIndex" />
       <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetAnnotationsIndex" />
+      <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelShortObjectNameIndex" />
 
       <contentBasedClassFileProcessor implementation="org.jetbrains.jet.plugin.libraries.JetContentBasedFileSubstitutor" />
       <psi.clsCustomNavigationPolicy implementation="org.jetbrains.jet.plugin.libraries.JetClsNavigationPolicy" />
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetIndexKeys.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetIndexKeys.java
index 6ae438a71fd..5914c20fa22 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetIndexKeys.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetIndexKeys.java
@@ -17,10 +17,7 @@
 package org.jetbrains.jet.plugin.stubindex;
 
 import com.intellij.psi.stubs.StubIndexKey;
-import org.jetbrains.jet.lang.psi.JetAnnotationEntry;
-import org.jetbrains.jet.lang.psi.JetClassOrObject;
-import org.jetbrains.jet.lang.psi.JetNamedFunction;
-import org.jetbrains.jet.lang.psi.JetProperty;
+import org.jetbrains.jet.lang.psi.*;
 
 /**
  * @author Nikolay Krasko
@@ -30,6 +27,9 @@ public interface JetIndexKeys {
     StubIndexKey<String, JetClassOrObject> SUPERCLASS_NAME_KEY = StubIndexKey.createIndexKey("jet.class.superClassName");
     StubIndexKey<String, JetClassOrObject> FQN_KEY = StubIndexKey.createIndexKey("jet.fqn");
 
+    StubIndexKey<String, JetObjectDeclaration> TOP_LEVEL_OBJECT_SHORT_NAME_KEY =
+            StubIndexKey.createIndexKey("jet.top.level.object.short.name");
+
     StubIndexKey<String, JetNamedFunction> TOP_LEVEL_FUNCTION_SHORT_NAME_KEY =
             StubIndexKey.createIndexKey("jet.top.level.function.short.name");
 
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java
new file mode 100644
index 00000000000..91fb8f5a3d8
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java
@@ -0,0 +1,45 @@
+/*
+ * 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.stubindex;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.stubs.StringStubIndexExtension;
+import com.intellij.psi.stubs.StubIndexKey;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetObjectDeclaration;
+
+import java.util.Collection;
+
+public class JetTopLevelShortObjectNameIndex extends StringStubIndexExtension<JetObjectDeclaration> {
+    private static final JetTopLevelShortObjectNameIndex ourInstance = new JetTopLevelShortObjectNameIndex();
+
+    public static JetTopLevelShortObjectNameIndex getInstance() {
+        return ourInstance;
+    }
+
+    @NotNull
+    @Override
+    public StubIndexKey<String, JetObjectDeclaration> getKey() {
+        return JetIndexKeys.TOP_LEVEL_OBJECT_SHORT_NAME_KEY;
+    }
+
+    @Override
+    public Collection<JetObjectDeclaration> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
+        return super.get(s, project, new JetSourceFilterScope(scope));
+    }
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java b/idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java
index b729763fd6f..5d505c16d3c 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java
@@ -50,6 +50,10 @@ public class StubIndexServiceImpl implements StubIndexService {
 
         sink.occurrence(JetIndexKeys.SHORT_NAME_KEY, name);
 
+        if (stub.isTopLevel()) {
+            sink.occurrence(JetIndexKeys.TOP_LEVEL_OBJECT_SHORT_NAME_KEY, name);
+        }
+
         FqName fqName = stub.getFQName();
         if (fqName != null) {
             sink.occurrence(JetIndexKeys.FQN_KEY, fqName.toString());
diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
index 33fa5101ded..51ef22491db 100644
--- a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java
@@ -161,7 +161,7 @@ public class JetStubsTest extends LightCodeInsightFixtureTestCase {
     public void testNamedObject() {
         doBuildTest("object Test {}",
                     "PsiJetFileStubImpl[package=]\n" +
-                    "  OBJECT_DECLARATION:PsiJetObjectStubImpl[name=Test fqName=Test]\n");
+                    "  OBJECT_DECLARATION:PsiJetObjectStubImpl[top name=Test fqName=Test]\n");
     }
 
     public void testAnnotationOnClass() {