diff --git a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/AddDomElementQuickFix.java b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/AddDomElementQuickFix.java
index 1c710d18290b..f3f7e50a403b 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/highlighting/AddDomElementQuickFix.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/highlighting/AddDomElementQuickFix.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,10 @@ package com.intellij.util.xml.highlighting;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.xml.XmlAttribute;
+import com.intellij.psi.xml.XmlElement;
 import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.PsiNavigateUtil;
 import com.intellij.util.xml.DomBundle;
 import com.intellij.util.xml.DomElement;
 import org.jetbrains.annotations.NotNull;
@@ -60,6 +63,9 @@ public class AddDomElementQuickFix<T extends DomElement> implements LocalQuickFi
 
   @Override
   public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-    myElement.ensureXmlElementExists();
+    final XmlElement element = myElement.ensureXmlElementExists();
+
+    final XmlElement navigationElement = isTag() ? element : ((XmlAttribute)element).getValueElement();
+    PsiNavigateUtil.navigate(navigationElement);
   }
 }
\ No newline at end of file