diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java
index 430f2182e516..aedddcec5e8a 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToAtomicIntention.java
@@ -100,7 +100,6 @@ public class ConvertFieldToAtomicIntention extends PsiElementBaseIntentionAction
   public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
     final PsiVariable psiVariable = getVariable(element);
     LOG.assertTrue(psiVariable != null);
-    psiVariable.normalizeDeclaration();
 
     final Query<PsiReference> refs = ReferencesSearch.search(psiVariable);
 
@@ -111,6 +110,8 @@ public class ConvertFieldToAtomicIntention extends PsiElementBaseIntentionAction
     }
     if (!FileModificationService.getInstance().preparePsiElementsForWrite(elements)) return;
 
+    psiVariable.normalizeDeclaration();
+
     final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
     final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
     final PsiType fromType = psiVariable.getType();
diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java
index 8bdce8435be8..afab27b3d6d2 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertFieldToThreadLocalIntention.java
@@ -70,7 +70,6 @@ public class ConvertFieldToThreadLocalIntention extends PsiElementBaseIntentionA
   public void invoke(@NotNull Project project, Editor editor, @NotNull PsiElement element) throws IncorrectOperationException {
     final PsiField psiField = PsiTreeUtil.getParentOfType(element, PsiField.class);
     LOG.assertTrue(psiField != null);
-    psiField.normalizeDeclaration();
     final Query<PsiReference> refs = ReferencesSearch.search(psiField);
 
     final Set<PsiElement> elements = new HashSet<PsiElement>();
@@ -79,6 +78,7 @@ public class ConvertFieldToThreadLocalIntention extends PsiElementBaseIntentionA
       elements.add(reference.getElement());
     }
     if (!FileModificationService.getInstance().preparePsiElementsForWrite(elements)) return;
+    psiField.normalizeDeclaration();
 
     final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
     final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);