diff --git a/indent/vue.vim b/indent/vue.vim
index 668b654..45c9de1 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -81,16 +81,16 @@ function! s:GetIndentByContext()
   let prevline = getline(s:PrevNonBlankNonComment(v:lnum))
   let curline = getline(v:lnum)
 
-  if curline =~ s:block_tag
-    let ind = 0
-  endif
-
-  if prevline =~ s:block_tag
-    if prevline !~ s:template_tag
+  " 0 for blocks except template as it can be nested
+  if curline =~ s:block_tag && curline !~ s:template_tag
       let ind = 0
     endif
   endif
 
+  if prevline =~ s:block_tag && prevline !~ s:template_tag
+      let ind = 0
+  endif
+
   return ind
 endfunction
 
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 62e8e74..06caf6c 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -106,7 +106,7 @@ function! s:SetSyntax(block, syntax, lang)
   let syntax_lang_name = s:GetSyntaxLangName(syntax)
   let syntax_lang = lang ? 'lang=["'']'.syntax_lang_name.'["''][^>]*' : ''
   let start = '<'.block.'[^>]*'.syntax_lang.'>'
-  let end = '</'.block.'>'
+  let end = '^\s*</'.block.'>'
   let syntax_group = s:GetGroupNameForHighlight(syntax)
 
   execute 'syntax region '.name.' fold '