diff --git a/lcl/interfaces/win32/win32lclintf.inc b/lcl/interfaces/win32/win32lclintf.inc
index c006c15b58..20e8e439d2 100644
--- a/lcl/interfaces/win32/win32lclintf.inc
+++ b/lcl/interfaces/win32/win32lclintf.inc
@@ -347,7 +347,7 @@ begin
       TaskConfig.hwndParent := Screen.ActiveCustomForm.Handle
     else
     if Assigned(Application.MainForm) then
-      TaskConfig.hwndParent := Application.MainForm.Handle
+      TaskConfig.hwndParent := Application.MainFormHandle
     else
       TaskConfig.hwndParent := AppHandle;
     TaskConfig.hInstance := HInstance;
@@ -694,7 +694,7 @@ begin
       TaskConfig.hwndParent := Screen.ActiveCustomForm.Handle
     else
     if Assigned(Application.MainForm) then
-      TaskConfig.hwndParent := Application.MainForm.Handle
+      TaskConfig.hwndParent := Application.MainFormHandle
     else
       TaskConfig.hwndParent := AppHandle;
     TaskConfig.hInstance := HInstance;
diff --git a/lcl/interfaces/win32/win32wsdialogs.pp b/lcl/interfaces/win32/win32wsdialogs.pp
index 0105abd430..305a3fe353 100644
--- a/lcl/interfaces/win32/win32wsdialogs.pp
+++ b/lcl/interfaces/win32/win32wsdialogs.pp
@@ -935,7 +935,7 @@ begin
     Result := Screen.ActiveCustomForm.Handle
   else
   if Assigned(Application.MainForm) then
-    Result := Application.MainForm.Handle
+    Result := Application.MainFormHandle
   else
     Result := WidgetSet.AppHandle;
 end;