diff --git a/lcl/interfaces/win32/win32wscontrols.pp b/lcl/interfaces/win32/win32wscontrols.pp
index a13fa471f9..f1d9df84ae 100644
--- a/lcl/interfaces/win32/win32wscontrols.pp
+++ b/lcl/interfaces/win32/win32wscontrols.pp
@@ -360,6 +360,9 @@ begin
   if AccelTable <> 0 then
     DestroyAcceleratorTable(AccelTable);
   DestroyWindow(Handle);
+  { TODO: HACK: next line "fixes" opendialogs being closed after 
+    closing message dialog }
+  TWin32WidgetSet(InterfaceObject).HandleEvents;
 end;
 
 procedure TWin32WSWinControl.Invalidate(const AWinControl: TWinControl);