diff --git a/editor.c b/editor.c
index 976a952..dc7cd55 100644
--- a/editor.c
+++ b/editor.c
@@ -2187,7 +2187,7 @@ static void _editor_init_syntaxes(editor_t *editor) {
         { "`([^`\\\\]|\\\\.)*`",                       NULL,              TB_YELLOW | TB_BOLD,     TB_DEFAULT },
         { "/\\*",                                      "\\*/",            TB_CYAN,                 TB_DEFAULT },
         { "//.*$",                                     NULL,              TB_CYAN,                 TB_DEFAULT },
-        { "(?<=(\\s|^))#\\s.*$",                       NULL,              TB_CYAN,                 TB_DEFAULT },
+        { "(?<=(\\s|^))#(\\s.*)?$",                    NULL,              TB_CYAN,                 TB_DEFAULT },
         { "^#!/.*$",                                   NULL,              TB_CYAN,                 TB_DEFAULT },
         { "[(){}<>\\[\\].,;:?!+=/\\\\%^*-]",           NULL,              TB_RED | TB_BOLD,        TB_DEFAULT },
         { "(?<!\\w)[\\%@$][a-zA-Z_$][a-zA-Z0-9_]*\\b", NULL,              TB_GREEN,                TB_DEFAULT },
diff --git a/tests/func/test_syntax.sh b/tests/func/test_syntax.sh
index bb01be7..76c7a1a 100755
--- a/tests/func/test_syntax.sh
+++ b/tests/func/test_syntax.sh
@@ -76,6 +76,7 @@ source 'test.sh'
 
 cat >$tmpf <<"EOD"
 # ccc
+#
 aaa "bbb" // ccc "ccc"
 aaa "bbb" # ccc "ccc"
 EOD
@@ -83,11 +84,13 @@ extra_opts=(-yy $tmpf)
 macro=''
 declare -A expected
 declare -A not_expected
-# a==97 b==98 c==99
+# a==97 b==98 c==99 #=35
 expected[style_a]='<ch=97 fg=0\b'
 expected[style_b]='<ch=98 fg=260\b'
 expected[style_c]='<ch=99 fg=7\b'
+expected[style_h]='<ch=35 fg=7\b'
 not_expected[style_not_a]='<ch=97 fg=(260|7)\b'
 not_expected[style_not_b]='<ch=98 fg=(0|7)\b'
 not_expected[style_not_c]='<ch=99 fg=(0|260)\b'
+not_expected[style_not_h]='<ch=35 fg=(0|260)\b'
 source 'test.sh'