diff --git a/.pick_status.json b/.pick_status.json
index f42f061dcc9..018e41f8228 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4034,7 +4034,7 @@
         "description": "nir: fix uniform cloning helper",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b47b8d16d94792cc4694f350b4bad212e357e9f0",
         "notes": null
diff --git a/src/compiler/nir/nir_linking_helpers.c b/src/compiler/nir/nir_linking_helpers.c
index 8874540b73b..73bc317ad4b 100644
--- a/src/compiler/nir/nir_linking_helpers.c
+++ b/src/compiler/nir/nir_linking_helpers.c
@@ -1171,7 +1171,9 @@ nir_clone_uniform_variable(nir_shader *nir, nir_variable *uniform, bool spirv)
    nir_foreach_variable_with_modes(v, nir, uniform->data.mode) {
       if ((spirv && uniform->data.mode & nir_var_mem_ubo &&
            v->data.binding == uniform->data.binding) ||
-          (!spirv && !strcmp(uniform->name, v->name))) {
+          (!spirv &&
+           ((!strcmp(uniform->name, v->name) && !uniform->data.explicit_binding && !v->data.explicit_binding) ||
+            (uniform->data.explicit_binding && v->data.explicit_binding && v->data.binding == uniform->data.binding)))) {
          new_var = v;
          break;
       }