diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaCreatePropertyFix.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaCreatePropertyFix.java
index d32b9507e744..ff765b3736bc 100644
--- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaCreatePropertyFix.java
+++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaCreatePropertyFix.java
@@ -18,11 +18,15 @@ package com.intellij.codeInspection.i18n;
 import com.intellij.lang.properties.psi.PropertiesFile;
 import com.intellij.lang.properties.references.CreatePropertyFix;
 import com.intellij.lang.properties.references.I18nizeQuickFixDialog;
+import com.intellij.lang.properties.references.I18nizeQuickFixModel;
+import com.intellij.openapi.application.AccessToken;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLiteralExpression;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.*;
+import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -32,19 +36,47 @@ import java.util.List;
  * @author Maxim.Mossienko
  */
 public class JavaCreatePropertyFix extends CreatePropertyFix {
+  private static final Logger LOG = Logger.getInstance(JavaCreatePropertyFix.class);
+
   public JavaCreatePropertyFix() {}
 
   public JavaCreatePropertyFix(PsiElement element, String key, final List<PropertiesFile> propertiesFiles) {
     super(element, key, propertiesFiles);
   }
 
+  @Override
+  protected Pair<String, String> doAction(Project project, PsiElement psiElement, I18nizeQuickFixModel model) {
+    final Pair<String, String> result = super.doAction(project, psiElement, model);
+    if (result != null && psiElement instanceof PsiLiteralExpression) {
+      final String key = result.first;
+
+      final StringBuilder buffer = new StringBuilder();
+      buffer.append('"');
+      StringUtil.escapeStringCharacters(key.length(), key, buffer);
+      buffer.append('"');
+
+      final AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(JavaCreatePropertyFix.class);
+      try {
+        final PsiExpression newKeyLiteral = JavaPsiFacade.getElementFactory(project).createExpressionFromText(buffer.toString(), null);
+        psiElement.replace(newKeyLiteral);
+      }
+      catch (IncorrectOperationException e) {
+        LOG.error(e);
+      }
+      finally {
+        token.finish();
+      }
+    }
+    return result;
+  }
+
   @Nullable
-  protected static Pair<String, String> invokeAction(@NotNull final Project project,
-                                                     @NotNull PsiFile file,
-                                                     @NotNull PsiElement psiElement,
-                                                     @Nullable final String suggestedKey,
-                                                     @Nullable String suggestedValue,
-                                                     @Nullable final List<PropertiesFile> propertiesFiles) {
+  protected Pair<String, String> invokeAction(@NotNull final Project project,
+                                              @NotNull PsiFile file,
+                                              @NotNull PsiElement psiElement,
+                                              @Nullable final String suggestedKey,
+                                              @Nullable String suggestedValue,
+                                              @Nullable final List<PropertiesFile> propertiesFiles) {
     final PsiLiteralExpression literalExpression = psiElement instanceof PsiLiteralExpression ? (PsiLiteralExpression)psiElement : null;
     final String propertyValue = suggestedValue == null ? "" : suggestedValue;
 
@@ -59,5 +91,4 @@ public class JavaCreatePropertyFix extends CreatePropertyFix {
     );
     return doAction(project, psiElement, dialog);
   }
-
 }
diff --git a/plugins/properties/src/com/intellij/lang/properties/references/CreatePropertyFix.java b/plugins/properties/src/com/intellij/lang/properties/references/CreatePropertyFix.java
index b875f857999b..0a3fc8ef7b0d 100644
--- a/plugins/properties/src/com/intellij/lang/properties/references/CreatePropertyFix.java
+++ b/plugins/properties/src/com/intellij/lang/properties/references/CreatePropertyFix.java
@@ -88,11 +88,11 @@ public class CreatePropertyFix implements IntentionAction, LocalQuickFix {
   }
 
   @Nullable
-  private static Pair<String, String> invokeAction(@NotNull final Project project,
-                                                   @NotNull PsiFile file,
-                                                   @NotNull PsiElement psiElement,
-                                                   @Nullable final String suggestedKey,
-                                                   @Nullable final List<PropertiesFile> propertiesFiles) {
+  private Pair<String, String> invokeAction(@NotNull final Project project,
+                                            @NotNull PsiFile file,
+                                            @NotNull PsiElement psiElement,
+                                            @Nullable final String suggestedKey,
+                                            @Nullable final List<PropertiesFile> propertiesFiles) {
     final I18nizeQuickFixModel model;
     final I18nizeQuickFixDialog.DialogCustomization dialogCustomization = createDefaultCustomization(suggestedKey, propertiesFiles);
 
@@ -128,8 +128,7 @@ public class CreatePropertyFix implements IntentionAction, LocalQuickFix {
     return new I18nizeQuickFixDialog.DialogCustomization(NAME, false, true, propertiesFiles, suggestedKey == null ? "" : suggestedKey);
   }
 
-  protected static Pair<String, String> doAction(Project project, PsiElement psiElement, 
-                                               I18nizeQuickFixModel model) {
+  protected Pair<String, String> doAction(Project project, PsiElement psiElement, I18nizeQuickFixModel model) {
     if (!model.hasValidData()) {
       return null;
     }