diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java
index 0da9795ac0fb..3b7765bc32b9 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java
@@ -19,6 +19,7 @@ import com.intellij.codeInsight.daemon.QuickFixBundle;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.util.RefactoringChangeUtil;
@@ -95,7 +96,7 @@ public class AddTypeArgumentsFix extends MethodArgumentFix {
               methodExpression.setQualifierExpression(qualifierExpression);
             }
 
-            return copy;
+            return (PsiExpression)JavaCodeStyleManager.getInstance(copy.getProject()).shortenClassReferences(copy);
           }
         }
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/afterFQN.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/afterFQN.java
new file mode 100644
index 000000000000..a69afc2dccb4
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/afterFQN.java
@@ -0,0 +1,14 @@
+// "Add explicit type arguments" "true"
+import java.util.Date;
+import java.util.List;
+import java.util.Collections;
+
+class Bar {
+  public static void main(String[] args) {
+    new Foo().foo(Collections.<Date>emptyList());
+  }
+}
+
+class Foo {
+  void foo(List<java.util.Date> dates) { }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/beforeFQN.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/beforeFQN.java
new file mode 100644
index 000000000000..64b582f7a1b1
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addTypeArguments/beforeFQN.java
@@ -0,0 +1,13 @@
+// "Add explicit type arguments" "true"
+import java.util.List;
+import java.util.Collections;
+
+class Bar {
+  public static void main(String[] args) {
+    new Foo().fo<caret>o(Collections.emptyList());
+  }
+}
+
+class Foo {
+  void foo(List<java.util.Date> dates) { }
+}
\ No newline at end of file