diff --git a/rc/filetype/yaml.kak b/rc/filetype/yaml.kak
index 48834414..e29a8a3e 100644
--- a/rc/filetype/yaml.kak
+++ b/rc/filetype/yaml.kak
@@ -34,7 +34,7 @@ add-highlighter shared/yaml regions
 add-highlighter shared/yaml/code      default-region group
 add-highlighter shared/yaml/double_string region '"' (?<!\\)(\\\\)*"       fill string
 add-highlighter shared/yaml/single_string region "'" "'"                   fill string
-add-highlighter shared/yaml/comment       region '#' '$'                   fill comment
+add-highlighter shared/yaml/comment       region '(?:^| )#' $              fill comment
 
 add-highlighter shared/yaml/code/ regex ^(---|\.\.\.)$ 0:meta
 add-highlighter shared/yaml/code/ regex ^(\h*:\w*) 0:keyword