diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
index 30bb0f67631..3567949b811 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
@@ -607,6 +607,7 @@ vec4_visitor::run()
     */
    move_grf_array_access_to_scratch();
    move_uniform_array_access_to_pull_constants();
+   pack_uniform_registers();
 
    bool progress;
    do {
@@ -614,7 +615,6 @@ vec4_visitor::run()
       progress = dead_code_eliminate() || progress;
    } while (progress);
 
-   pack_uniform_registers();
 
    if (failed)
       return false;