diff --git a/.pick_status.json b/.pick_status.json
index 055df55fac1..a5b13e3196e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -7060,7 +7060,7 @@
         "description": "r600/sfn: override register ID when it doesn't matter",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "79ca456b4837b3bc21cf9ef3c03c505c4b4909f6"
     },
diff --git a/src/gallium/drivers/r600/sfn/sfn_virtualvalues.cpp b/src/gallium/drivers/r600/sfn/sfn_virtualvalues.cpp
index 32af0477c8f..b41e705b0df 100644
--- a/src/gallium/drivers/r600/sfn/sfn_virtualvalues.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_virtualvalues.cpp
@@ -433,7 +433,7 @@ int RegisterVec4::sel() const
    int comp = 0;
    while (comp < 4 && m_values[comp]->value()->chan() > 3)
       ++comp;
-   return m_values[comp < 4 ? comp : 0]->value()->sel();
+   return comp < 4 ? m_values[comp]->value()->sel() : 0;
 }
 
 bool RegisterVec4::ready(int block_id, int index) const