diff --git a/.pick_status.json b/.pick_status.json
index 5b2590ec005..48c10ef1c09 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -256,7 +256,7 @@
         "description": "nir: fix sorting before assigning varying driver locations",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "1e93b0caa10d9d9090eaa3bd517a5144930f28a4"
     },
diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c
index 1d056fc97b1..7c21b63dc19 100644
--- a/src/compiler/nir/nir_linking_helpers.c
+++ b/src/compiler/nir/nir_linking_helpers.c
@@ -1433,7 +1433,9 @@ insert_sorted(struct exec_list *var_list, nir_variable *new_var)
        */
       if (new_var->data.per_primitive < var->data.per_primitive ||
           (new_var->data.per_primitive == var->data.per_primitive &&
-           var->data.location > new_var->data.location)) {
+           (var->data.location > new_var->data.location ||
+            (var->data.location == new_var->data.location &&
+             var->data.location_frac > new_var->data.location_frac)))) {
          exec_node_insert_node_before(&var->node, &new_var->node);
          return;
       }