diff --git a/grammars/csharp.tmLanguage b/grammars/csharp.tmLanguage
index 037851c..442709d 100644
--- a/grammars/csharp.tmLanguage
+++ b/grammars/csharp.tmLanguage
@@ -6807,10 +6807,10 @@
 (
   <
   (?<type_args>
-    [^<>()]++|
-    <\g<type_args>*+>|
-    \(\g<type_args>*+\)
-  )*+
+    [^<>()]|
+    \((?:[^<>()]|<[^<>()]*>|\([^<>()]*\))*\)|
+    <\g<type_args>*>
+  )*
   >\s*
 )?                                                # type arguments
 (?=\()                                            # open paren of argument list</string>
diff --git a/grammars/csharp.tmLanguage.cson b/grammars/csharp.tmLanguage.cson
index 09a93ba..2e08e87 100644
--- a/grammars/csharp.tmLanguage.cson
+++ b/grammars/csharp.tmLanguage.cson
@@ -4080,10 +4080,10 @@ repository:
       (
         <
         (?<type_args>
-          [^<>()]++|
-          <\\g<type_args>*+>|
-          \\(\\g<type_args>*+\\)
-        )*+
+          [^<>()]|
+          \\((?:[^<>()]|<[^<>()]*>|\\([^<>()]*\\))*\\)|
+          <\\g<type_args>*>
+        )*
         >\\s*
       )?                                                # type arguments
       (?=\\()                                            # open paren of argument list
diff --git a/src/csharp.tmLanguage.yml b/src/csharp.tmLanguage.yml
index e15c354..0509638 100644
--- a/src/csharp.tmLanguage.yml
+++ b/src/csharp.tmLanguage.yml
@@ -2593,10 +2593,10 @@ repository:
       (
         <
         (?<type_args>
-          [^<>()]++|
-          <\g<type_args>*+>|
-          \(\g<type_args>*+\)
-        )*+
+          [^<>()]|
+          \((?:[^<>()]|<[^<>()]*>|\([^<>()]*\))*\)|
+          <\g<type_args>*>
+        )*
         >\s*
       )?                                                # type arguments
       (?=\()                                            # open paren of argument list