diff --git a/ide/customformeditor.pp b/ide/customformeditor.pp
index 898123634b..236fad6edc 100644
--- a/ide/customformeditor.pp
+++ b/ide/customformeditor.pp
@@ -670,6 +670,8 @@ Begin
           if i>AForm.ComponentCount-1 then
             i:=AForm.ComponentCount-1;
         end;
+        if PropertyEditorHook.LookupRoot=AForm then
+          PropertyEditorHook.LookupRoot:=nil;
         if not (AForm is TForm) then
           writeln('WARNING: TCustomFormEditor.DeleteControl ',AForm.ClassName);
         JITFormList.DestroyJITForm(TForm(AForm));
diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc
index cc8612e132..48e4b992e8 100644
--- a/lcl/include/customform.inc
+++ b/lcl/include/customform.inc
@@ -804,7 +804,6 @@ Begin
   ParentFont := False;
   Ctl3D := True;
 //  FBorderIcons := [biSystemMenu, biMinimize, biMaximize];
-  FBorderStyle := bsSizeable;
   FWindowState := wsNormal;
 //  FDefaultMonitor := dmActiveForm;
   FIcon := TIcon.Create;
@@ -1182,6 +1181,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.75  2002/12/03 17:40:37  mattias
+  fixed deleting lookup form when form is deleted
+
   Revision 1.74  2002/11/30 11:24:05  mattias
   removed unused TCustomForm.WMDestroy