diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
index c84c6892d833..6f99db6b4d38 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
@@ -39,6 +39,7 @@ import com.intellij.util.ObjectUtils;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.containers.JBIterable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
@@ -184,11 +185,12 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
   }
 
   @NotNull
-  private static LookupElement createMethodRefOnThis(PsiType functionalInterfaceType, PsiMethod psiMethod) {
+  private static LookupElement createMethodRefOnThis(PsiType functionalInterfaceType, PsiMethod psiMethod, @Nullable PsiClass outerClass) {
+    String fullString = (outerClass == null ? "" : outerClass.getName() + ".") + "this::" + psiMethod.getName();
     return LookupElementBuilder
-      .create(psiMethod)
-      .withPresentableText("this::" + psiMethod.getName())
-      .withInsertHandler((context, item) -> context.getDocument().insertString(context.getStartOffset(), "this::"))
+      .create(psiMethod, fullString)
+      .withLookupString(psiMethod.getName())
+      .withPresentableText(fullString)
       .withTypeText(functionalInterfaceType.getPresentableText())
       .withIcon(AllIcons.Nodes.MethodReference)
       .withAutoCompletionPolicy(AutoCompletionPolicy.NEVER_AUTOCOMPLETE);
@@ -215,15 +217,23 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
                                                          PsiElement originalPosition,
                                                          PsiSubstitutor substitutor, PsiType expectedReturnType) {
     List<LookupElement> result = new ArrayList<>();
-    final PsiClass psiClass = PsiTreeUtil.getParentOfType(originalPosition, PsiClass.class);
-    if (psiClass != null) {
+
+    Iterable<PsiClass> instanceClasses = JBIterable
+      .generate(originalPosition, PsiElement::getParent)
+      .filter(PsiMember.class)
+      .takeWhile(m -> !m.hasModifierProperty(PsiModifier.STATIC))
+      .filter(PsiClass.class);
+
+    boolean first = true;
+    for (PsiClass psiClass : instanceClasses) {
       for (PsiMethod psiMethod : psiClass.getMethods()) {
         if (!psiMethod.hasModifierProperty(PsiModifier.STATIC) &&
             hasAppropriateReturnType(expectedReturnType, psiMethod) &&
             areParameterTypesAppropriate(psiMethod, params, substitutor, 0)) {
-          result.add(createMethodRefOnThis(functionalInterfaceType, psiMethod));
+          result.add(createMethodRefOnThis(functionalInterfaceType, psiMethod, first ? null : psiClass));
         }
       }
+      first = false;
     }
     return result;
   }
diff --git a/java/java-tests/testData/codeInsight/completion/smartType/OuterMethodReference-out.java b/java/java-tests/testData/codeInsight/completion/smartType/OuterMethodReference-out.java
new file mode 100644
index 000000000000..8d18ab64a39f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/smartType/OuterMethodReference-out.java
@@ -0,0 +1,9 @@
+class Outer {
+  void foo(){}
+
+  class Inner {
+    void bar() {
+      Runnable r = Outer.this::foo;<caret>
+    }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/smartType/OuterMethodReference.java b/java/java-tests/testData/codeInsight/completion/smartType/OuterMethodReference.java
new file mode 100644
index 000000000000..0059341013e7
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/smartType/OuterMethodReference.java
@@ -0,0 +1,9 @@
+class Outer {
+  void foo(){}
+
+  class Inner {
+    void bar() {
+      Runnable r = fo<caret>
+    }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java
index 432686032e6c..96be81f1b80f 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java
@@ -146,6 +146,8 @@ public class SmartType18CompletionTest extends LightFixtureCompletionTestCase {
 
   public void testStaticMethodReference() { doTest(false); }
 
+  public void testOuterMethodReference() { doTest(true); }
+
   public void testMethodReferenceOnAncestor() { doTest(true); }
 
   public void testNoLambdaSuggestionForGenericsFunctionalInterfaceMethod() throws Exception {