diff --git a/plugins/org.eclipse.acceleo.aql.tm/grammar/acceleo.tmLanguage.json b/plugins/org.eclipse.acceleo.aql.tm/grammar/acceleo.tmLanguage.json
index 0677567ea..795902c0f 100644
--- a/plugins/org.eclipse.acceleo.aql.tm/grammar/acceleo.tmLanguage.json
+++ b/plugins/org.eclipse.acceleo.aql.tm/grammar/acceleo.tmLanguage.json
@@ -757,6 +757,9 @@
 				{
 					"include": "#statement-expression-tag-close"
 				},
+				{
+					"include": "#statement-expression-tag-double"
+				},
 				{
 					"include": "#statement-expression-expression"
 				}
@@ -768,10 +771,13 @@
 		},
 		"statement-expression-expression": {
 			"name": "meta.expression.aql",
-			"begin": "(?<=\\[)",
-			"end": "(?=/\\])"
+			"match": "(?<=\\[).*?(?=/\\])"
 		},
 		"statement-expression-tag-close": {
+			"name": "keyword.other.statement.expression.acceleo",
+			"match": "/\\]\\[(?!/)"
+		},
+		"statement-expression-tag-double": {
 			"name": "keyword.other.statement.expression.acceleo",
 			"match": "/\\]"
 		}