diff --git a/src/command_manager.cc b/src/command_manager.cc
index a636d852..1110583f 100644
--- a/src/command_manager.cc
+++ b/src/command_manager.cc
@@ -88,6 +88,11 @@ TokenList parse(const String& line,
                 ++pos;
             else if (line[pos] == '\\' and pos+1 < length and line[pos+1] == '\n')
                 pos += 2;
+            else if (line[pos] == '#')
+            {
+                while (pos != length and line[pos] != '\n')
+                    ++pos;
+            }
             else
                 break;
         }
diff --git a/src/rc/kakrc.kak b/src/rc/kakrc.kak
index dee0f42e..6efbde36 100644
--- a/src/rc/kakrc.kak
+++ b/src/rc/kakrc.kak
@@ -10,6 +10,7 @@ hook global WinSetOption filetype=kak %{
     addhl -group kak-highlight regex (?<=\<regex)\h+(\S+) 1:magenta
     addhl -group kak-highlight regex (["'])(?:\\\1|.)*?\1 0:magenta
     addhl -group kak-highlight regex (?<=\<set[gbw])\h+(\S+)\h+(\S+) 1:magenta 2:red
+    addhl -group kak-highlight regex \#[^\n]*\n 0:cyan
 }
 
 hook global WinSetOption filetype=(?!kak).* %{