diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeClassStaticProcessor.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeClassStaticProcessor.java
index 03af8f885246..288bab4647db 100644
--- a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeClassStaticProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeClassStaticProcessor.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.refactoring.makeStatic;
 
+import com.intellij.codeInsight.intention.impl.BaseMoveInitializerToMethodAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
@@ -44,6 +45,7 @@ import java.util.List;
  */
 public class MakeClassStaticProcessor extends MakeMethodOrClassStaticProcessor<PsiClass> {
   private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.makeMethodStatic.MakeClassStaticProcessor");
+  private List<PsiField> myFieldsToSplit = new ArrayList<PsiField>();
 
   public MakeClassStaticProcessor(final Project project, final PsiClass aClass, final Settings settings) {
     super(project, aClass, settings);
@@ -123,6 +125,9 @@ public class MakeClassStaticProcessor extends MakeMethodOrClassStaticProcessor<P
           }
         }
       }
+      for (PsiField field : myFieldsToSplit) {
+        MoveInstanceMembersUtil.moveInitializerToConstructor(factory, constructor, field);
+      }
     }
 
 
@@ -221,7 +226,12 @@ public class MakeClassStaticProcessor extends MakeMethodOrClassStaticProcessor<P
       }
     }
     else if (mySettings.isMakeClassParameter() && (element instanceof PsiThisExpression || element instanceof PsiSuperExpression)) {
-      element.replace(factory.createExpressionFromText(convertToFieldName(mySettings.getClassParameterName()), null));
+      final PsiElement replace =
+        element.replace(factory.createExpressionFromText(convertToFieldName(mySettings.getClassParameterName()), null));
+      final PsiField field = PsiTreeUtil.getParentOfType(replace, PsiField.class);
+      if (field != null) {
+        myFieldsToSplit.add(field);
+      }
     }
     else if (element instanceof PsiNewExpression && mySettings.isMakeClassParameter()) {
       final PsiNewExpression newExpression = ((PsiNewExpression)element);
diff --git a/java/java-tests/testData/refactoring/makeClassStatic/FieldInitializerSplit.java b/java/java-tests/testData/refactoring/makeClassStatic/FieldInitializerSplit.java
new file mode 100644
index 000000000000..6e77f1f523e4
--- /dev/null
+++ b/java/java-tests/testData/refactoring/makeClassStatic/FieldInitializerSplit.java
@@ -0,0 +1,6 @@
+class Outer {
+  class In<caret>ner {
+    Object x = Outer.this.getClass();
+
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/makeClassStatic/FieldInitializerSplit_after.java b/java/java-tests/testData/refactoring/makeClassStatic/FieldInitializerSplit_after.java
new file mode 100644
index 000000000000..005259e85d76
--- /dev/null
+++ b/java/java-tests/testData/refactoring/makeClassStatic/FieldInitializerSplit_after.java
@@ -0,0 +1,12 @@
+class Outer {
+  static class Inner {
+    Object x;
+
+      private Outer anObject;
+
+      public Inner(Outer anObject) {
+          this.anObject = anObject;
+          this.x = anObject.getClass();
+      }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java
index 4f3296f16a8f..af309f3ba165 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java
@@ -45,6 +45,7 @@ public class MakeClassStaticTest extends LightRefactoringTestCase {
 
   public void testNonDefaultConstructorAnonymousClass() throws Exception {perform();}
   public void testDefaultConstructorAnonymousClass() throws Exception {perform();}
+  public void testFieldInitializerSplit() throws Exception {perform();}
 
   public void testRegReference() throws Exception {
     perform();