diff --git a/.pick_status.json b/.pick_status.json
index 42eb74e9d7e..1e7d5b73615 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -157,7 +157,7 @@
         "description": "radv: fix exporting multiviews with NGG",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index c6070dfe8ef..ef6e170899a 100644
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -89,11 +89,16 @@ static bool needs_view_index_sgpr(struct radv_shader_args *args,
 		if (args->shader_info->needs_multiview_view_index || (!args->options->key.vs_common_out.as_es && args->options->key.has_multiview_view_index))
 			return true;
 		break;
-	case MESA_SHADER_GEOMETRY:
 	case MESA_SHADER_TESS_CTRL:
 		if (args->shader_info->needs_multiview_view_index)
 			return true;
 		break;
+	case MESA_SHADER_GEOMETRY:
+		if (args->shader_info->needs_multiview_view_index ||
+		    (args->options->key.vs_common_out.as_ngg &&
+		     args->options->key.has_multiview_view_index))
+			return true;
+		break;
 	default:
 		break;
 	}