diff --git a/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt b/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt
new file mode 100644
index 00000000000..66e065edf74
--- /dev/null
+++ b/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt
@@ -0,0 +1,12 @@
+package first
+
+fun firstFun() {
+    val a : String? = ""
+    a.hello<caret>
+}
+
+// EXIST: helloFun
+// EXIST: helloFunPreventAutoInsert
+// EXIST: helloWithParams
+// ABSENT: helloFake
+// NUMBER: 3
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/ExtensionOnNullable-2.kt b/idea/testData/completion/basic/multifile/ExtensionOnNullable-2.kt
new file mode 100644
index 00000000000..0d782748e87
--- /dev/null
+++ b/idea/testData/completion/basic/multifile/ExtensionOnNullable-2.kt
@@ -0,0 +1,14 @@
+package second
+
+fun String.helloFun() {
+}
+
+fun String.helloWithParams(i : Int) : String {
+    return ""
+}
+
+fun String.helloFunPreventAutoInsert() {
+}
+
+fun Int.helloFake() {
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/JetMultifileBasicCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetMultifileBasicCompletionTest.java
index 690ad171ccd..7056bf1131c 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetMultifileBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetMultifileBasicCompletionTest.java
@@ -35,6 +35,10 @@ public class JetMultifileBasicCompletionTest extends JetCompletionMultiTestBase
         doFileTest(2);
     }
 
+    public void testExtensionOnNullable() throws Exception {
+        doFileTest(2);
+    }
+
     public void todotestExtensionProperty() throws Exception {
         doFileTest(2);
     }