diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java b/java/java-impl-refactorings/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
index 6cef0ae48a51..905853234668 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
@@ -688,43 +688,17 @@ public class AnonymousToInnerHandler implements RefactoringActionHandlerOnPsiEle
     PsiMethodCallExpression methodCall = (PsiMethodCallExpression) ((PsiExpressionStatement) statement).getExpression();
     PsiExpressionList exprList = methodCall.getArgumentList();
 
+    final PsiThisExpression qualifiedThis = (PsiThisExpression) factory.createExpressionFromText("A.this", null);
+    final PsiJavaCodeReferenceElement targetClassRef = factory.createClassReferenceElement(myTargetClass);
+    PsiJavaCodeReferenceElement thisQualifier = qualifiedThis.getQualifier();
+    assert thisQualifier != null;
+    thisQualifier.replace(targetClassRef);
 
-    {
-      final PsiThisExpression qualifiedThis =
-        (PsiThisExpression) factory.createExpressionFromText("A.this", null);
-      final PsiJavaCodeReferenceElement targetClassRef = factory.createClassReferenceElement(myTargetClass);
-      PsiJavaCodeReferenceElement thisQualifier = qualifiedThis.getQualifier();
-      assert thisQualifier != null;
-      thisQualifier.replace(targetClassRef);
-
-      for (PsiExpression expr : paramExpressions) {
-        ChangeContextUtil.encodeContextInfo(expr, true);
-        final PsiElement newExpr = exprList.add(expr);
-        ChangeContextUtil.decodeContextInfo(newExpr, myTargetClass, qualifiedThis);
-      }
+    for (PsiExpression expr : paramExpressions) {
+      ChangeContextUtil.encodeContextInfo(expr, true);
+      final PsiElement newExpr = exprList.add(expr);
+      ChangeContextUtil.decodeContextInfo(newExpr, myTargetClass, qualifiedThis);
     }
-
-    class SupersConvertor extends JavaRecursiveElementVisitor {
-      @Override public void visitThisExpression(@NotNull PsiThisExpression expression) {
-        try {
-          final PsiThisExpression qualifiedThis =
-                  (PsiThisExpression) factory.createExpressionFromText("A.this", null);
-          final PsiJavaCodeReferenceElement targetClassRef = factory.createClassReferenceElement(myTargetClass);
-          PsiJavaCodeReferenceElement thisQualifier = qualifiedThis.getQualifier();
-          assert thisQualifier != null;
-          thisQualifier.replace(targetClassRef);
-          expression.replace(qualifiedThis);
-        } catch (IncorrectOperationException e) {
-          LOG.error(e);
-        }
-      }
-
-      @Override public void visitReferenceExpression(@NotNull PsiReferenceExpression expression) {
-      }
-    }
-
-    final SupersConvertor supersConvertor = new SupersConvertor();
-    methodCall.getArgumentList().accept(supersConvertor);
   }
 
   private void calculateTypeParametersToCreate () {
diff --git a/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifier.java b/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifier.java
new file mode 100644
index 000000000000..ec24ed415b77
--- /dev/null
+++ b/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifier.java
@@ -0,0 +1,9 @@
+public class LocalClass {
+    public LocalClass(LocalClass o) {
+    }
+
+    void test() {
+        new <caret>LocalClass(this) {
+        };
+    }
+}
diff --git a/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifierWithImplicitThis.java b/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifierWithImplicitThis.java
new file mode 100644
index 000000000000..bd714a31bbbb
--- /dev/null
+++ b/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifierWithImplicitThis.java
@@ -0,0 +1,11 @@
+public class LocalClass {
+    LocalClass field;
+
+    public LocalClass(LocalClass o) {
+    }
+
+    void test() {
+        new <caret>LocalClass(field) {
+        };
+    }
+}
diff --git a/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifierWithImplicitThis_after.java b/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifierWithImplicitThis_after.java
new file mode 100644
index 000000000000..96de8b85e39a
--- /dev/null
+++ b/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifierWithImplicitThis_after.java
@@ -0,0 +1,16 @@
+public class LocalClass {
+    LocalClass field;
+
+    public LocalClass(LocalClass o) {
+    }
+
+    void test() {
+        new MyClass();
+    }
+
+    private static class MyClass extends LocalClass {
+        public MyClass() {
+            super(LocalClass.this.field);
+        }
+    }
+}
diff --git a/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifier_after.java b/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifier_after.java
new file mode 100644
index 000000000000..e4e2f2597ff7
--- /dev/null
+++ b/java/java-tests/testData/refactoring/anonymousToInner/addThisQualifier_after.java
@@ -0,0 +1,14 @@
+public class LocalClass {
+    public LocalClass(LocalClass o) {
+    }
+
+    void test() {
+        new MyClass();
+    }
+
+    private static class MyClass extends LocalClass {
+        public MyClass() {
+            super(LocalClass.this);
+        }
+    }
+}
diff --git a/java/java-tests/testData/refactoring/anonymousToInner/outerThisQualifier.java b/java/java-tests/testData/refactoring/anonymousToInner/outerThisQualifier.java
new file mode 100644
index 000000000000..170e23ba7d50
--- /dev/null
+++ b/java/java-tests/testData/refactoring/anonymousToInner/outerThisQualifier.java
@@ -0,0 +1,12 @@
+public class Test {
+    public Test(Test test) {
+    }
+
+    private class Inner {
+        public void x() {
+            new <caret>Test(Test.this) {
+
+            };
+        }
+    }
+}
diff --git a/java/java-tests/testData/refactoring/anonymousToInner/outerThisQualifier_after.java b/java/java-tests/testData/refactoring/anonymousToInner/outerThisQualifier_after.java
new file mode 100644
index 000000000000..0a1990ffc0c2
--- /dev/null
+++ b/java/java-tests/testData/refactoring/anonymousToInner/outerThisQualifier_after.java
@@ -0,0 +1,17 @@
+public class Test {
+    public Test(Test test) {
+    }
+
+    private class Inner {
+        public void x() {
+            new MyClass();
+        }
+
+        private static class MyClass extends Test {
+            public MyClass() {
+                super(Test.this);
+            }
+        }
+
+    }
+}
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/AnonymousToInnerTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/AnonymousToInnerTest.java
index 499648d6a8d4..99f16354d59b 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/AnonymousToInnerTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/AnonymousToInnerTest.java
@@ -133,7 +133,18 @@ public class AnonymousToInnerTest extends LightJavaCodeInsightTestCase {
   public void testTypeParameterNotMentioned() {
     doTest("MyClass", true);
   }
-  
+
+  public void testAddThisQualifier() {
+    doTest("MyClass", true);
+  }
+
+  public void testAddThisQualifierWithImplicitThis() {
+    doTest("MyClass", true);
+  }
+
+  public void testOuterThisQualifier() {
+    doTest("MyClass", true);
+  }
 
   private void doTest(final String newClassName, final boolean makeStatic) {
     configureByFile(TEST_ROOT + getTestName(true) + ".java");