diff --git a/.pick_status.json b/.pick_status.json
index 7013d43e9e7..902111dc2e8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -454,7 +454,7 @@
         "description": "brw/algebraic: Constant folding for BROADCAST and SHUFFLE",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "04e17832782983853299ac616caea8567abbd71f",
         "notes": null
diff --git a/src/intel/compiler/brw_opt_algebraic.cpp b/src/intel/compiler/brw_opt_algebraic.cpp
index b9038455944..3e062b32fd4 100644
--- a/src/intel/compiler/brw_opt_algebraic.cpp
+++ b/src/intel/compiler/brw_opt_algebraic.cpp
@@ -302,6 +302,30 @@ brw_opt_constant_fold_instruction(const intel_device_info *devinfo, fs_inst *ins
       }
       break;
 
+   case SHADER_OPCODE_BROADCAST:
+      if (inst->src[0].file == IMM) {
+         inst->opcode = BRW_OPCODE_MOV;
+         inst->force_writemask_all = true;
+         inst->resize_sources(1);
+
+         /* The destination of BROADCAST will always be is_scalar, so the
+          * allocation will always be REG_SIZE * reg_unit. Adjust the
+          * exec_size to match.
+          */
+         inst->exec_size = 8 * reg_unit(devinfo);
+         assert(inst->size_written == inst->dst.component_size(inst->exec_size));
+         progress = true;
+      }
+      break;
+
+   case SHADER_OPCODE_SHUFFLE:
+      if (inst->src[0].file == IMM) {
+         inst->opcode = BRW_OPCODE_MOV;
+         inst->resize_sources(1);
+         progress = true;
+      }
+      break;
+
    default:
       break;
    }
@@ -666,6 +690,11 @@ brw_opt_algebraic(fs_visitor &s)
          if (is_uniform(inst->src[0])) {
             inst->opcode = BRW_OPCODE_MOV;
             inst->force_writemask_all = true;
+
+            /* The destination of BROADCAST will always be is_scalar, so the
+             * allocation will always be REG_SIZE * reg_unit. Adjust the
+             * exec_size to match.
+             */
             inst->exec_size = 8 * reg_unit(devinfo);
             assert(inst->size_written == inst->dst.component_size(inst->exec_size));
             inst->resize_sources(1);