diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 6cd9e060a..ae837e8c5 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -89,6 +89,18 @@ DDXRingBell(int volume, int pitch, int duration)
     return;
 }
 
+
+#ifdef HAS_DEVWINDOWS
+static void
+xwinDevWindowsHandlerNotify(int fd, int ready, void *data)
+{
+    /* This should process Windows messages, but instead all of that is delayed
+     * until the wakeup handler is called.
+     */
+    ;
+}
+#endif
+
 /* See Porting Layer Definition - p. 17 */
 void
 InitInput(int argc, char *argv[])
@@ -129,7 +141,7 @@ InitInput(int argc, char *argv[])
         }
 
         /* Add the message queue as a device to wait for in WaitForSomething */
-        AddEnabledDevice(g_fdMessageQueue);
+        SetNotifyFd(g_fdMessageQueue, xwinDevWindowsHandlerNotify, X_NOTIFY_READ, NULL);
     }
 #endif