diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java
index d3c9c19e3..15104c56f 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java
@@ -1295,11 +1295,14 @@ public class ScriptDocument {
                         initStart = bodyStart + m.start(3);
                         int searchPos = bodyStart + m.end(3);
                         int depth = 0;
+                        int angleDepth = 0;
                         while (searchPos < text.length()) {
                             char c = text.charAt(searchPos);
                             if (c == '(' || c == '[' || c == '{') depth++;
                             else if (c == ')' || c == ']' || c == '}') depth--;
-                            else if ((c == ';' || c == ',') && depth == 0) {
+                            else if (c == '<') angleDepth++;
+                            else if (c == '>') angleDepth--;
+                            else if ((c == ';' || c == ',') && depth == 0 && angleDepth == 0) {
                                 initEnd = searchPos;
                                 break;
                             }
diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java
index 8c0669dbe..137c4db02 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java
@@ -1496,12 +1496,14 @@ public class TokenHoverInfo {
         // Never add space before these closing/trailing characters
         if (firstChar == '(' || firstChar == '[' || firstChar == '{' || 
             firstChar == '.' || firstChar == ',' || firstChar == ';' ||
+            firstChar == '>' ||  // No space before closing angle bracket
             (firstChar == ':' && lastToken.equals("?"))) {
             return false;
         }
 
         // Never add space after these opening/leading characters
-        if (lastChar == '(' || lastChar == '[' || lastChar == '{' || lastChar == '.') {
+        if (lastChar == '(' || lastChar == '[' || lastChar == '{' || 
+            lastChar == '.' || lastChar == '<') {  // No space after opening angle bracket
             return false;
         }