diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index a1a8e76af0a..cfb9f2a18be 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -355,6 +355,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	if (parser->commented_newlines) {
 		BEGIN NEWLINE_CATCHUP;
 	}
+	yyextra->space_tokens = 1;
 	yyextra->lexing_directive = 0;
 	yylineno++;
 	yycolumn = 0;
diff --git a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected b/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
index 93bcffb47c8..ce5c102ed33 100644
--- a/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
+++ b/src/glsl/glcpp/tests/125-es-short-circuit-undefined.c.expected
@@ -8,6 +8,7 @@
 
 #version 300 es
 
+ 
 
 
 
@@ -15,8 +16,7 @@
 
 
 
-
-
+ 
 
 Success