diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java
index 7292471206cc..8098a46c9350 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenPropertyRenameHandler.java
@@ -55,8 +55,6 @@ public class MavenPropertyRenameHandler extends PsiElementRenameHandler {
   }
 
   private PsiElement findTarget(DataContext context) {
-    PsiElement target = MavenTargetUtil.getRefactorTarget(PlatformDataKeys.EDITOR.getData(context),
-                                                          LangDataKeys.PSI_FILE.getData(context));
-    return isVetoed(target) ? null : target;
+    return MavenTargetUtil.getRefactorTarget(PlatformDataKeys.EDITOR.getData(context), LangDataKeys.PSI_FILE.getData(context));
   }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java
index 957cd95d05ac..9ff7fd088cc9 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/MavenVetoModelRenameCondition.java
@@ -18,9 +18,10 @@ package org.jetbrains.idea.maven.dom.refactorings;
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.idea.maven.dom.MavenDomUtil;
+import org.jetbrains.idea.maven.dom.references.MavenPsiElementWrapper;
 
 public class MavenVetoModelRenameCondition implements Condition<PsiElement> {
   public boolean value(PsiElement target) {
-    return MavenDomUtil.isMavenFile(target) && !MavenDomUtil.isMavenProperty(target);
+    return target instanceof MavenPsiElementWrapper || MavenDomUtil.isMavenFile(target);
   }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java
index 1fad11be78b2..18ecd76db4b6 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenTargetUtil.java
@@ -28,7 +28,7 @@ import org.jetbrains.idea.maven.dom.MavenDomUtil;
 public class MavenTargetUtil {
   public static PsiElement getRefactorTarget(Editor editor, PsiFile file) {
     PsiElement target = getFindTarget(editor, file);
-    return target == null || !MavenDomUtil.isMavenFile(target) ? null : target;
+    return target == null || !MavenDomUtil.isMavenProperty(target) ? null : target;
   }
 
   public static PsiElement getFindTarget(Editor editor, PsiFile file) {