Hi Tobias, Thanks for your efforts. I have prepared a patch accordingly that wraps org-src-font-lock-fontify-block’s body with save-match-data (attached). If I don’t hear anything bad about it in the next few days, I’ll push it :) Please let me know if my commit message agrees with your understanding of the issue. All the best, Timothy