diff --git a/.pick_status.json b/.pick_status.json
index bed067d9f38..49e53bef4fa 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -9094,7 +9094,7 @@
         "description": "nir/lower_fragcolor: Fix driver_location assignment",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/compiler/nir/nir_lower_fragcolor.c b/src/compiler/nir/nir_lower_fragcolor.c
index 95eaf3dff2e..965b1cf24a8 100644
--- a/src/compiler/nir/nir_lower_fragcolor.c
+++ b/src/compiler/nir/nir_lower_fragcolor.c
@@ -80,7 +80,7 @@ lower_fragcolor_instr(nir_intrinsic_instr *instr, nir_builder *b, unsigned max_d
                                                    glsl_vec4_type(),
                                                    name);
       out_color->data.location = FRAG_RESULT_DATA0 + i;
-      out_color->data.driver_location = i;
+      out_color->data.driver_location = b->shader->num_outputs++;
       out_color->data.index = out->data.index;
       nir_store_var(b, out_color, frag_color, writemask);
    }