diff --git a/components/webrender_surfman/lib.rs b/components/webrender_surfman/lib.rs
index 533614256c1..9460417dc7e 100644
--- a/components/webrender_surfman/lib.rs
+++ b/components/webrender_surfman/lib.rs
@@ -80,6 +80,9 @@ impl WebrenderSurfman {
                 let _ = device.destroy_surface(&mut context, &mut surface);
                 err
             })?;
+
+        device.make_context_current(&context)?;
+
         let swap_chain = if headless {
             Some(SwapChain::create_attached(
                 &mut device,