diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index 6af9481a85c..80261c3c33b 100644
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@@ -307,7 +307,11 @@ impl Window {
                 }
             }
         } else {
-            for event in self.window.wait_events() {
+            // 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;