diff --git a/lcl/interfaces/win32/win32int.pp b/lcl/interfaces/win32/win32int.pp
index 543a509a82..d43ad24404 100644
--- a/lcl/interfaces/win32/win32int.pp
+++ b/lcl/interfaces/win32/win32int.pp
@@ -146,6 +146,7 @@ type
     FWaitHandles: array of HANDLE;
     FWaitHandlers: array of TWaitHandler;
     FWaitPipeHandlers: PPipeEventInfo;
+    FPendingWaitHandlerIndex: Integer;
 
     InitCommonControlsEx: function(ICC: PInitCommonControlsEx): LongBool; stdcall;
 
diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc
index 4b887d61bc..62c69f762b 100644
--- a/lcl/interfaces/win32/win32object.inc
+++ b/lcl/interfaces/win32/win32object.inc
@@ -30,6 +30,7 @@
  ------------------------------------------------------------------------------}
 constructor TWin32WidgetSet.Create;
 begin
+  FPendingWaitHandlerIndex := -1;
   inherited Create;
   FTimerData  := TList.Create;
   FMetrics.cbSize := SizeOf(FMetrics);
@@ -281,8 +282,20 @@ var
   AccelTable: HACCEL;
   retVal, index: dword;
   pHandles: Windows.LPHANDLE;
+
+    procedure CallWaitHandler;
+    begin
+      FWaitHandlers[index].OnEvent(FWaitHandlers[index].UserData, 0);
+    end;
+
 begin
   repeat
+    if FPendingWaitHandlerIndex >= 0 then
+    begin
+      index := FPendingWaitHandlerIndex;
+      FPendingWaitHandlerIndex := -1;
+      CallWaitHandler;
+    end;
 {$ifdef DEBUG_ASYNCEVENTS}
     if Length(FWaitHandles) > 0 then
       DebugLn('[ProcessMessages] WaitHandleCount=', IntToStr(FWaitHandleCount),
@@ -297,7 +310,7 @@ begin
     if (WAIT_OBJECT_0 <= retVal) and (retVal < WAIT_OBJECT_0 + FWaitHandleCount) then
     begin
       index := retVal-WAIT_OBJECT_0;
-      FWaitHandlers[index].OnEvent(FWaitHandlers[index].UserData, 0);
+      CallWaitHandler;
     end else
     if retVal = WAIT_OBJECT_0 + FWaitHandleCount then
     begin
@@ -366,7 +379,7 @@ end;
  ------------------------------------------------------------------------------}
 procedure TWin32WidgetSet.AppWaitMessage;
 var
-  timeout: DWord;
+  retVal, timeout: DWord;
   pHandles: Windows.LPHANDLE;
 begin
   RedrawMenus;
@@ -379,8 +392,10 @@ begin
     pHandles := @FWaitHandles[0]
   else
     pHandles := nil;
-  Windows.MsgWaitForMultipleObjects(FWaitHandleCount, pHandles,
+  retVal := Windows.MsgWaitForMultipleObjects(FWaitHandleCount, pHandles,
     false, timeout, QS_ALLINPUT);
+  if (WAIT_OBJECT_0 <= retVal) and (retVal < WAIT_OBJECT_0 + FWaitHandleCount) then
+    FPendingWaitHandlerIndex := retVal-WAIT_OBJECT_0;
   Assert(False,'Trace:Leave wait message');
 end;