diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index c8d2f43..7cde857 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -75,7 +75,7 @@ syn region markdownH6 matchgroup=markdownH6Delimiter start=" \{,3}######\s" end=
 
 syn match markdownBlockquote ">\%(\s\|$\)" contained nextgroup=@markdownBlock
 
-syn region markdownCodeBlock start="    \|\t" end="$" contained
+syn region markdownCodeBlock start="^\n\( \{4,}\|\t\)" end="^\ze \{,3}\S.*$" keepend
 
 " TODO: real nesting
 syn match markdownListMarker "\%(\t\| \{0,4\}\)[-*+]\%(\s\+\S\)\@=" contained