diff --git a/.pick_status.json b/.pick_status.json
index 2cb82f5..d239861 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "glsl: default to compat shaders in compat profile",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "c7e3d31b0b5f22299a6bd72655502ce8427b40bf"
     },
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index 7daf65be..6c735ea 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -396,14 +396,13 @@
 {
    bool es_token_present = false;
    bool compat_token_present = false;
+   bool core_token_present = false;
    if (ident) {
       if (strcmp(ident, "es") == 0) {
          es_token_present = true;
       } else if (version >= 150) {
          if (strcmp(ident, "core") == 0) {
-            /* Accept the token.  There's no need to record that this is
-             * a core profile shader since that's the only profile we support.
-             */
+            core_token_present = true;
          } else if (strcmp(ident, "compatibility") == 0) {
             compat_token_present = true;
 
@@ -444,7 +443,8 @@
 
    this->compat_shader = compat_token_present ||
                          (this->ctx->API == API_OPENGL_COMPAT &&
-                          this->language_version == 140) ||
+                          this->language_version >= 140 &&
+                          !core_token_present) ||
                          (!this->es_shader && this->language_version < 140);
 
    bool supported = false;