diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
index cbb33d12787..7866c92206b 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
@@ -173,7 +173,7 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
 
         registerScopeKeywordsCompletion(new InClassBodyFilter(),
                                         "abstract", "class", "enum", "final", "fun", "get", "inline", "internal",
-                                        "open", "override", "private", "protected", "public", "set", "trait",
+                                        "object", "open", "override", "private", "protected", "public", "set", "trait",
                                         "type", "val", "var");
 
         registerScopeKeywordsCompletion(new InNonClassBlockFilter(),
diff --git a/idea/testData/completion/keywords/InClassBeforeFun.kt b/idea/testData/completion/keywords/InClassBeforeFun.kt
index 1250e6486a0..908f79863f3 100644
--- a/idea/testData/completion/keywords/InClassBeforeFun.kt
+++ b/idea/testData/completion/keywords/InClassBeforeFun.kt
@@ -32,7 +32,7 @@ public class Test {
 // EXIST:  internal
 // ABSENT: is
 // ABSENT: null
-// ABSENT: object
+// EXIST:  object
 // EXIST:  open
 // ABSENT: out
 // EXIST:  override
diff --git a/idea/testData/completion/keywords/InClassScope.kt b/idea/testData/completion/keywords/InClassScope.kt
index bbf7f7ef8ae..0682d0b1148 100644
--- a/idea/testData/completion/keywords/InClassScope.kt
+++ b/idea/testData/completion/keywords/InClassScope.kt
@@ -27,7 +27,7 @@ class TestClass {
 // EXIST:  internal
 // ABSENT: is
 // ABSENT: null
-// ABSENT: object
+// EXIST:  object
 // EXIST:  open
 // ABSENT: out
 // EXIST:  override
diff --git a/idea/testData/completion/keywords/classObject.kt b/idea/testData/completion/keywords/classObject.kt
new file mode 100644
index 00000000000..cfaa7effe3e
--- /dev/null
+++ b/idea/testData/completion/keywords/classObject.kt
@@ -0,0 +1,5 @@
+class Test {
+    class <caret>
+}
+
+// EXIST: object
\ No newline at end of file