diff --git a/after/syntax/css/css-grid-1.vim b/after/syntax/css/css-grid-1.vim
index 6be5d5e..f8b0026 100644
--- a/after/syntax/css/css-grid-1.vim
+++ b/after/syntax/css/css-grid-1.vim
@@ -2,7 +2,7 @@ syn match cssFontProp contained "\<grid-template\(-\(columns\|rows\|areas\)\)\=\
 syn match cssFontProp contained "\<grid-auto-\(columns\|rows\|flow\|position\)\>"
 syn match cssFontProp contained "\<grid-\(row\|column\)\(-\(start\|end\)\)\=\>"
 syn match cssFontProp contained "\<grid-area\>"
-syn match cssFontProp contained "\<\(row\|grid\)-gap\>"
+syn match cssFontProp contained "\<grid\(-\(column\|row\)\)\=-gap\>"
 syn keyword cssFontAttr contained grid subgrid dense span
 syn match cssFontAttr contained "\<inline-grid\>"
 syn match cssValueNumber contained "[01]\(.\d\+\)\=fr"
diff --git a/test/test.css b/test/test.css
index e4c7d80..7f6c835 100644
--- a/test/test.css
+++ b/test/test.css
@@ -255,7 +255,8 @@
   grid-column: auto;
   grid-row: auto;
   grid-area: auto;
-  row-gap: auto;
+  grid-column-gap: auto;
+  grid-row-gap: auto;
   grid-gap: auto;
 }
 
diff --git a/test/test.html b/test/test.html
index cd6028c..926436b 100644
--- a/test/test.html
+++ b/test/test.html
@@ -283,7 +283,8 @@
   grid-column: auto;
   grid-row: auto;
   grid-area: auto;
-  row-gap: auto;
+  grid-column-gap: auto;
+  grid-row-gap: auto;
   grid-gap: auto;
 }
 </style>