diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt
index dd9af3db93b..9a40a9609a9 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt
@@ -67,7 +67,8 @@ object KeywordCompletion {
             CommentFilter(),
             ParentFilter(ClassFilter(javaClass<JetLiteralStringTemplateEntry>())),
             ParentFilter(ClassFilter(javaClass<JetConstantExpression>())),
-            LeftNeighbour(TextFilter("."))
+            LeftNeighbour(TextFilter(".")),
+            LeftNeighbour(TextFilter("?."))
     ))
 
     private class CommentFilter() : ElementFilter {
diff --git a/idea/testData/completion/keywords/AfterSafeDot.kt b/idea/testData/completion/keywords/AfterSafeDot.kt
new file mode 100644
index 00000000000..ce9eb1994c0
--- /dev/null
+++ b/idea/testData/completion/keywords/AfterSafeDot.kt
@@ -0,0 +1,6 @@
+fun foo() {
+    val str : String?
+    str?.<caret>
+}
+
+// NUMBER: 0
diff --git a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
index bcd7aa0ec56..503d27e9a7d 100644
--- a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
@@ -17,13 +17,9 @@
 package org.jetbrains.jet.completion;
 
 import com.intellij.testFramework.TestDataPath;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
-import org.jetbrains.jet.JUnit3RunnerWithInners;
+import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -52,6 +48,12 @@ public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTes
         doTest(fileName);
     }
     
+    @TestMetadata("AfterSafeDot.kt")
+    public void testAfterSafeDot() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/AfterSafeDot.kt");
+        doTest(fileName);
+    }
+    
     @TestMetadata("AfterSpaceAndDot.kt")
     public void testAfterSpaceAndDot() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/AfterSpaceAndDot.kt");