diff --git a/designer/customnonformdesigner.pas b/designer/customnonformdesigner.pas
index e7e46d5c1d..56c3c5fb9f 100644
--- a/designer/customnonformdesigner.pas
+++ b/designer/customnonformdesigner.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   Classes, SysUtils,
-  FormEditingIntf;
+  FormEditingIntf, LazUtilities;
   
 type
 
@@ -75,9 +75,7 @@ var
 begin
   Form1 := TNonFormProxyDesignerForm(Data1) as INonFormDesigner;
   Form2 := TNonFormProxyDesignerForm(Data2) as INonFormDesigner;
-  {$PUSH}{$Q-} // Overflow is allowed to occur
-  Result := Integer(PtrInt(Form1.LookupRoot) - PtrInt(Form2.LookupRoot));
-  {$POP}
+  Result := ComparePointers(Pointer(Form1.LookupRoot), Pointer(Form2.LookupRoot)));
 end;
 
 function CompareLookupRootAndNonFormDesignerForm(Key, Data: Pointer): integer;
@@ -87,9 +85,7 @@ var
 begin
   LookupRoot := TComponent(Key);
   Form := TNonFormProxyDesignerForm(Data) as INonFormDesigner;
-  {$PUSH}{$Q-} // Overflow is allowed to occur
-  Result := Integer(PtrInt(LookupRoot) - PtrInt(Form.LookupRoot));
-  {$POP}
+  Result := ComparePointers(Pointer(LookupRoot), Pointer(Form.LookupRoot)));
 end;
 
 { TCustomNonFormDesignerForm }