diff --git a/src/stage1/astgen.cpp b/src/stage1/astgen.cpp
index 6f38eca936..4040d5a5f9 100644
--- a/src/stage1/astgen.cpp
+++ b/src/stage1/astgen.cpp
@@ -4599,8 +4599,11 @@ static IrInstSrc *astgen_builtin_fn_call(Stage1AstGen *ag, Scope *scope, AstNode
             }
         case BuiltinFnIdShuffle:
             {
+                // Used for the type expr and the mask expr
+                Scope *comptime_scope = create_comptime_scope(ag->codegen, node, scope);
+
                 AstNode *arg0_node = node->data.fn_call_expr.params.at(0);
-                IrInstSrc *arg0_value = astgen_node(ag, arg0_node, scope);
+                IrInstSrc *arg0_value = astgen_node(ag, arg0_node, comptime_scope);
                 if (arg0_value == ag->codegen->invalid_inst_src)
                     return arg0_value;
 
@@ -4615,7 +4618,7 @@ static IrInstSrc *astgen_builtin_fn_call(Stage1AstGen *ag, Scope *scope, AstNode
                     return arg2_value;
 
                 AstNode *arg3_node = node->data.fn_call_expr.params.at(3);
-                IrInstSrc *arg3_value = astgen_node(ag, arg3_node, scope);
+                IrInstSrc *arg3_value = astgen_node(ag, arg3_node, comptime_scope);
                 if (arg3_value == ag->codegen->invalid_inst_src)
                     return arg3_value;
 
diff --git a/test/behavior/vector.zig b/test/behavior/vector.zig
index 77793b67e6..85cdba224e 100644
--- a/test/behavior/vector.zig
+++ b/test/behavior/vector.zig
@@ -632,3 +632,16 @@ test "vector reduce operation" {
     try S.doTheTest();
     comptime try S.doTheTest();
 }
+
+test "mask parameter of @shuffle is comptime scope" {
+    const __v4hi = std.meta.Vector(4, i16);
+    var v4_a = __v4hi{ 0, 0, 0, 0 };
+    var v4_b = __v4hi{ 0, 0, 0, 0 };
+    var shuffled: __v4hi = @shuffle(i16, v4_a, v4_b, std.meta.Vector(4, i32){
+        std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
+        std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
+        std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
+        std.zig.c_translation.shuffleVectorIndex(0, @typeInfo(@TypeOf(v4_a)).Vector.len),
+    });
+    _ = shuffled;
+}