diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 052bef294a2..d6d8b6a1cea 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -12038,7 +12038,7 @@ static const struct
          { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE },
          { 0,            0,            FALSE },
          { 0,            0,            FALSE },
-/* 10 */ { 0,            0,            TRUE  },
+/* 10 */ { 0,            0,            FALSE },
          { 0,            0,            FALSE },
          { 0,            WAIT_TIMEOUT, FALSE },
          { 0,            0,            FALSE },
diff --git a/server/queue.c b/server/queue.c
index 3ab8d0020cb..d880dff2317 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1814,6 +1814,8 @@ DECL_HANDLER(get_message)
         reply->wparam = timer->id;
         reply->lparam = timer->lparam;
         reply->time   = get_tick_count();
+        if (!(req->flags & PM_NOYIELD) && current->process->idle_event)
+            set_event( current->process->idle_event );
         return;
     }