diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 0b4505c6023..2834d5d0c19 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -350,7 +350,7 @@ dependencies = [
 [[package]]
 name = "glutin"
 version = "0.0.7"
-source = "git+https://github.com/servo/glutin#183d96b44e497fcc441f94d32d5228e4c3d28c4d"
+source = "git+https://github.com/servo/glutin?branch=servo#8138fe5755aa1b23fee704994d52597109f1abe0"
 dependencies = [
  "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)",
  "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
@@ -376,7 +376,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
- "glutin 0.0.7 (git+https://github.com/servo/glutin)",
+ "glutin 0.0.7 (git+https://github.com/servo/glutin?branch=servo)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 507790e1348..83edef2900c 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -356,7 +356,7 @@ dependencies = [
 [[package]]
 name = "glutin"
 version = "0.0.7"
-source = "git+https://github.com/servo/glutin#183d96b44e497fcc441f94d32d5228e4c3d28c4d"
+source = "git+https://github.com/servo/glutin?branch=servo#8138fe5755aa1b23fee704994d52597109f1abe0"
 dependencies = [
  "android_glue 0.0.1 (git+https://github.com/tomaka/android-rs-glue)",
  "cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
@@ -382,7 +382,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
  "gleam 0.0.1 (git+https://github.com/servo/gleam)",
- "glutin 0.0.7 (git+https://github.com/servo/glutin)",
+ "glutin 0.0.7 (git+https://github.com/servo/glutin?branch=servo)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers)",
  "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index ca0a684d04a..ad71622a9a8 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -28,6 +28,7 @@ path = "../../components/util"
 
 [dependencies.glutin]
 git = "https://github.com/servo/glutin"
+branch = "servo"
 
 [dependencies.gleam]
 git = "https://github.com/servo/gleam"
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index 3174264d64d..5dedff7b46a 100644
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@@ -271,16 +271,8 @@ impl Window {
                 }
             }
         } else {
-            // GWTODO: Something has changed in the wait_events
-            // behaviour in glutin. Switching to poll events
-            // for now, so that things display correctly,
-            // need to fix glutin / handle the changed behaviour.
-            for event in self.window.poll_events() {
-                close_event = self.handle_window_event(event);
-                if close_event {
-                    break;
-                }
-            }
+            let event = self.window.wait_events().next().unwrap();
+            close_event = self.handle_window_event(event);
         }
 
         if close_event || self.window.is_closed() {