diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 8bdccd96d..186ae1755 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -1159,12 +1159,12 @@ glamor_composite_with_shader(CARD8 op,
         }
     }
 
+    glamor_make_current(glamor_priv);
+
     glamor_set_destination_pixmap_priv_nc(glamor_priv, dest_pixmap, dest_pixmap_priv);
     glamor_composite_set_shader_blend(glamor_priv, dest_pixmap_priv, &key, shader, &op_info);
     glamor_set_alu(screen, GXcopy);
 
-    glamor_make_current(glamor_priv);
-
     glamor_priv->has_source_coords = key.source != SHADER_SOURCE_SOLID;
     glamor_priv->has_mask_coords = (key.mask != SHADER_MASK_NONE &&
                                     key.mask != SHADER_MASK_SOLID);