diff --git a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeSystemAstBuilder.cs b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeSystemAstBuilder.cs
index 43cc33886d..fbc53925e7 100644
--- a/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeSystemAstBuilder.cs
+++ b/src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/Refactoring/TypeSystemAstBuilder.cs
@@ -239,7 +239,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 			}
 			
 			if (AlwaysUseShortTypeNames) {
-				return new SimpleType(typeDef.Name);
+				var shortResult = new SimpleType(typeDef.Name);
+				AddTypeArguments(shortResult, typeArguments, outerTypeParameterCount, typeDef.TypeParameterCount);
+				return shortResult;
 			}
 			
 			MemberType result = new MemberType();