diff --git a/grammars/angular/syntaxes/template-blocks.json b/grammars/angular/syntaxes/template-blocks.json
index 3fb9b2a..16748ca 100644
--- a/grammars/angular/syntaxes/template-blocks.json
+++ b/grammars/angular/syntaxes/template-blocks.json
@@ -12,7 +12,7 @@
 			"name": "keyword.control.block.transition.ng"
 		},
 		"block": {
-			"begin": "(@)((?:\\w+\\s*)+)",
+			"begin": "(@)((?:\\w+\\s*)+)(?=\\(|\\{)",
 			"beginCaptures": {
 				"1": {
 					"patterns": [
@@ -46,7 +46,7 @@
 			"contentName": "control.block.expression.ng",
 			"patterns": [
 				{
-					"include": "source.js"
+					"include": "expression.ng"
 				}
 			],
 			"end": "\\)",