diff --git a/CHANGELOG.md b/CHANGELOG.md
index a95a6aac..2e7913eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,9 @@ Changelog structure reference:
 
 ### Fixed
 
-- Zig source file path highlighter made the terminal lag with some files
+- Zig
+  - Source file path highlighter made the terminal lag with some files
+  - Non-terminating rule in lexer could make the editor hang
 
 ## [20.1.1]
 
diff --git a/core/src/main/grammar/Zig.flex b/core/src/main/grammar/Zig.flex
index 00af51a9..e2aa8a6d 100644
--- a/core/src/main/grammar/Zig.flex
+++ b/core/src/main/grammar/Zig.flex
@@ -246,10 +246,10 @@ BUILTINIDENTIFIER="@"[A-Za-z_][A-Za-z0-9_]*
 
 <UNT_SQUOT>       <<EOF>>                 { yybegin(YYINITIAL); return BAD_SQUOT; }
 <UNT_SQUOT>       {CRLF}                  { yybegin(YYINITIAL); return BAD_SQUOT; }
-<UNT_SQUOT>       [^\n]*                  { }
+<UNT_SQUOT>       [^\n]+                  { }
 <UNT_DQUOT>       <<EOF>>                 { yybegin(YYINITIAL); return BAD_DQUOT; }
 <UNT_DQUOT>       {CRLF}                  { yybegin(YYINITIAL); return BAD_DQUOT; }
-<UNT_DQUOT>       [^\n]*                  { }
+<UNT_DQUOT>       [^\n]+                  { }
 
 <YYINITIAL>      {WHITE_SPACE}            { return WHITE_SPACE; }