diff --git a/autoload/emmet/lang/html.vim b/autoload/emmet/lang/html.vim
index 8713a0b..93567c7 100644
--- a/autoload/emmet/lang/html.vim
+++ b/autoload/emmet/lang/html.vim
@@ -1,7 +1,7 @@
-let s:bx = '{\%({[^}]*}\|"[^"]*"\|''[^'']*''\|[^${}]\+\|\$#\|\${\w\+}\|\$\+\)*}'
+let s:bx = '{\%({[^}]*}\|"[^"]*"\|''[^'']*''\|\$#\|\${\w\+}\|\$\+\|[^{]\+\)*}'
 let s:mx = '\([+>]\|[<^]\+\)\{-}\s*'
 \     .'\((*\)\{-}\s*'
-\       .'\([@#.]\{-}[a-zA-Z_\!][a-zA-Z0-9:_\!\-$]*\|' . s:bx . '*[ \t\r\n}]*\|\[[^\]]\+\]\)'
+\       .'\([@#.]\{-}[a-zA-Z_\!][a-zA-Z0-9:_\!\-$]*\|' . s:bx . '\|\[[^\]]\+\]\)'
 \       .'\('
 \         .'\%('
 \           .'\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)'