diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp
index 31eefe8deef..8f8da60218e 100644
--- a/src/libs/cplusplus/CppRewriter.cpp
+++ b/src/libs/cplusplus/CppRewriter.cpp
@@ -395,7 +395,8 @@ FullySpecifiedType UseMinimalNames::apply(const Name *name, Rewrite *rewrite) co
     SubstitutionEnvironment *env = rewrite->env;
     Scope *scope = env->scope();
 
-    if (name->isTemplateNameId())
+    if (name->isTemplateNameId() ||
+            (name->isQualifiedNameId() && name->asQualifiedNameId()->name()->isTemplateNameId()))
         return FullySpecifiedType();
 
     if (! scope)