diff --git a/after/syntax/css/conditional-5.vim b/after/syntax/css/conditional-5.vim
new file mode 100644
index 0000000..5f22acd
--- /dev/null
+++ b/after/syntax/css/conditional-5.vim
@@ -0,0 +1 @@
+syn match cssFontDescriptor "@\(when\|else\)\>" nextgroup=cssFontDescriptorBlock skipwhite skipnl
diff --git a/test/test.css b/test/test.css
index 0c5b4f2..b1b7440 100644
--- a/test/test.css
+++ b/test/test.css
@@ -141,7 +141,19 @@
 }
 
 @supports (selector(.conditional-4)) {
-	display: auto;
+	.conditional-4 {
+		display: auto;
+	}
+}
+
+@when media(screen) {
+	.conditional-5 {
+		display: auto;
+	}
+} @else {
+	.conditional-5 {
+		display: auto;
+	}
 }
 
 .contain-1 {