diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index cedf960..3e8b15b 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -3546,6 +3546,8 @@ Removed:~
       point.
 
 Fixed:~
+    * Issue #212: Don't treat comment characters within code blocks as
+      headers.
     * PR #744: Fix typo in vimwiki_list_manipulation
     * Issue #715: s:clean_url is compatible with vim pre 7.4.1546 (sticky type
       checking)
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index f2fc48e..685a246 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -143,7 +143,7 @@ function! VimwikiFoldLevel(lnum)
   let line = getline(a:lnum)
 
   " Header/section folding...
-  if line =~# vimwiki#vars#get_syntaxlocal('rxHeader')
+  if line =~# vimwiki#vars#get_syntaxlocal('rxHeader') && !vimwiki#u#is_codeblock(a:lnum)
     return '>'.vimwiki#u#count_first_sym(line)
   " Code block folding...
   elseif line =~# vimwiki#vars#get_syntaxlocal('rxPreStart')