diff --git a/src/parse/read/directives.js b/src/parse/read/directives.js
index 32bcf39e68..5d62899dc1 100644
--- a/src/parse/read/directives.js
+++ b/src/parse/read/directives.js
@@ -1,4 +1,5 @@
-import { tokenizer, tokTypes, parseExpressionAt } from 'acorn';
+import { parse } from 'acorn';
+import spaces from '../../utils/spaces.js';
 
 export function readEventHandlerDirective ( parser, start, name ) {
 	const quoteMark = (
@@ -8,29 +9,51 @@ export function readEventHandlerDirective ( parser, start, name ) {
 	);
 
 	const expressionStart = parser.index;
-	let end = null;
-
-	let depth = 0;
-	for ( const token of tokenizer( parser.remaining() ) ) {
-		if ( token.type === tokTypes.parenL ) depth += 1;
-		if ( token.type === tokTypes.parenR ) {
-			depth -= 1;
-			if ( depth === 0 ) {
-				end = expressionStart + token.end;
-				break;
+
+	let str = '';
+	let escaped = false;
+
+	for ( let i = expressionStart; i < parser.template.length; i += 1 ) {
+		const char = parser.template[i];
+
+		if ( quoteMark ) {
+			if ( char === quoteMark ) {
+				if ( escaped ) {
+					str += quoteMark;
+				} else {
+					parser.index = i + 1;
+					break;
+				}
+			} else if ( escaped ) {
+				str += '\\' + char;
+				escaped = false;
+			} else if ( char === '\\' ) {
+				escaped = true;
+			} else {
+				str += char;
 			}
 		}
+
+		else if ( /\s/.test( char ) ) {
+			parser.index = i;
+			break;
+		}
+
+		else {
+			str += char;
+		}
 	}
 
-	const expression = parseExpressionAt( parser.template.slice( 0, end ), expressionStart );
-	parser.index = expression.end;
+	const ast = parse( spaces( expressionStart ) + str );
 
-	if ( expression.type !== 'CallExpression' ) {
-		parser.error( `Expected call expression`, expressionStart );
+	if ( ast.body.length > 1 ) {
+		parser.error( `Event handler should be a single call expression`, ast.body[1].start );
 	}
 
-	if ( quoteMark ) {
-		parser.eat( quoteMark, true );
+	const expression = ast.body[0].expression;
+
+	if ( expression.type !== 'CallExpression' ) {
+		parser.error( `Expected call expression`, expressionStart );
 	}
 
 	return {
diff --git a/test/parser/error-event-handler/error.json b/test/parser/error-event-handler/error.json
new file mode 100644
index 0000000000..a56e3c3b6e
--- /dev/null
+++ b/test/parser/error-event-handler/error.json
@@ -0,0 +1,8 @@
+{
+	"message": "Expected call expression",
+	"loc": {
+		"line": 1,
+		"column": 15
+	},
+	"pos": 15
+}
\ No newline at end of file
diff --git a/test/parser/error-event-handler/input.html b/test/parser/error-event-handler/input.html
new file mode 100644
index 0000000000..612b5ba399
--- /dev/null
+++ b/test/parser/error-event-handler/input.html
@@ -0,0 +1 @@
+<div on:click='foo'></div>
\ No newline at end of file