diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index e3afaada420..83362789b05 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -126,6 +126,8 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
         // Global configuration options, parsed from the command line.
         let opts = opts::get();
 
+        // Make sure the gl context is made current.
+        window.prepare_for_composite(0, 0);
 
         // Get both endpoints of a special channel for communication between
         // the client window and the compositor. This channel is unique because