diff --git a/lib/platform/CMSWindowsEventQueueBuffer.cpp b/lib/platform/CMSWindowsEventQueueBuffer.cpp
index 99366e1c..2f126095 100644
--- a/lib/platform/CMSWindowsEventQueueBuffer.cpp
+++ b/lib/platform/CMSWindowsEventQueueBuffer.cpp
@@ -56,7 +56,7 @@ CMSWindowsEventQueueBuffer::waitForEvent(double timeout)
 	// MsgWaitForMultipleObjects() will block even if the queue isn't
 	// empty if the messages in the queue were there before the last
 	// call to GetMessage()/PeekMessage().
-	if (HIWORD(GetQueueStatus(QS_ALLINPUT)) != 0) {
+	if (HIWORD(GetQueueStatus(QS_ALLEVENTS)) != 0) {
 		return;
 	}
 
@@ -73,7 +73,7 @@ CMSWindowsEventQueueBuffer::waitForEvent(double timeout)
 	// cancellation but that's okay because we're run in the main
 	// thread and we never cancel that thread.
 	HANDLE dummy[1];
-	MsgWaitForMultipleObjects(0, dummy, FALSE, t, QS_ALLINPUT);
+	MsgWaitForMultipleObjects(0, dummy, FALSE, t, QS_ALLEVENTS);
 }
 
 IEventQueueBuffer::Type
@@ -113,7 +113,7 @@ CMSWindowsEventQueueBuffer::addEvent(UInt32 dataID)
 bool
 CMSWindowsEventQueueBuffer::isEmpty() const
 {
-	return (HIWORD(GetQueueStatus(QS_ALLINPUT)) == 0);
+	return (HIWORD(GetQueueStatus(QS_ALLEVENTS)) == 0);
 }
 
 CEventQueueTimer*