diff --git a/CHANGELOG.md b/CHANGELOG.md
index 958c75f..f76339c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support setting an initial window position
 - Support hiding the window initially
 - Support creating maximized windows
+- Support waiting for events to reduce CPU load
 
 ## [v0.10.0-beta] 2020-05-10
 - Add `WindowConfig.TransparentFramebuffer` option to support window transparency onto the background
diff --git a/pixelgl/input.go b/pixelgl/input.go
index 541afb1..22468ef 100644
--- a/pixelgl/input.go
+++ b/pixelgl/input.go
@@ -1,6 +1,8 @@
 package pixelgl
 
 import (
+	"time"
+
 	"github.com/faiface/mainthread"
 	"github.com/faiface/pixel"
 	"github.com/go-gl/glfw/v3.3/glfw"
@@ -408,7 +410,24 @@ func (w *Window) UpdateInput() {
 	mainthread.Call(func() {
 		glfw.PollEvents()
 	})
+	w.doUpdateInput()
+}
 
+// UpdateInputWait blocks until an event is received or a timeout. If timeout is 0
+// then it will wait indefinitely
+func (w *Window) UpdateInputWait(timeout time.Duration) {
+	mainthread.Call(func() {
+		if timeout <= 0 {
+			glfw.WaitEvents()
+		} else {
+			glfw.WaitEventsTimeout(timeout.Seconds())
+		}
+	})
+	w.doUpdateInput()
+}
+
+// internal input bookkeeping
+func (w *Window) doUpdateInput() {
 	w.prevInp = w.currInp
 	w.currInp = w.tempInp