diff --git a/ide/projectinspector.pas b/ide/projectinspector.pas
index 7ef90e6472..154dc4ba58 100644
--- a/ide/projectinspector.pas
+++ b/ide/projectinspector.pas
@@ -590,6 +590,7 @@ end;
 procedure TProjectInspectorForm.UpdateButtons;
 var
   CurFile: TUnitInfo;
+  CurDependency: TPkgDependency;
 begin
   if (FUpdateLock>0) or (not Visible) then begin
     Include(FFlags,pifButtonsChanged);
@@ -599,8 +600,11 @@ begin
   if LazProject<>nil then begin
     AddBitBtn.Enabled:=true;
     CurFile:=GetSelectedFile;
-    RemoveBitBtn.Enabled:=(CurFile<>nil) and (CurFile<>LazProject.MainUnitInfo);
-    OpenBitBtn.Enabled:=(CurFile<>nil);
+    CurDependency:=GetSelectedDependency;
+    RemoveBitBtn.Enabled:=((CurFile<>nil) and (CurFile<>LazProject.MainUnitInfo))
+                      or ((CurDependency<>nil) and (not CurDependency.Removed));
+    OpenBitBtn.Enabled:=((CurFile<>nil)
+                     or ((CurDependency<>nil) and (not CurDependency.Removed)));
     OptionsBitBtn.Enabled:=true;
   end else begin
     AddBitBtn.Enabled:=false;
diff --git a/lcl/forms.pp b/lcl/forms.pp
index a67e796f03..f4ccfbd10b 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -293,6 +293,7 @@ type
     procedure DoCreate;
     procedure DoDestroy;
     procedure IconChanged(Sender: TObject);
+    function IsKeyPreviewStored: boolean;
     procedure SetActive(AValue: Boolean);
     procedure SetActiveControl(AWinControl: TWinControl);
     procedure SetBorderStyle(Value : TFormBorderStyle);
@@ -382,7 +383,7 @@ type
     property FormStyle : TFormStyle read FFormStyle write SetFormStyle default fsNormal;
     property FormState : TFormState read FFormState;
     property HelpFile: string read FHelpFile write FHelpFile stored IsHelpFileStored;
-    property KeyPreview: Boolean read FKeyPreview write FKeyPreview;
+    property KeyPreview: Boolean read FKeyPreview write FKeyPreview stored IsKeyPreviewStored;
     property Menu : TMainMenu read FMenu write SetMenu;
     property ModalResult : TModalResult read FModalResult write SetModalResult;
     property Visible write SetVisible default False;
@@ -414,6 +415,7 @@ type
     property FormStyle;
     property HelpFile;
     property Icon;
+    property KeyPreview;
     property Menu;
     property OnActivate;
     property OnClose;
diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc
index 5a033756c1..8a075e5d56 100644
--- a/lcl/include/customform.inc
+++ b/lcl/include/customform.inc
@@ -181,6 +181,14 @@ begin
     CNSendMessage(LM_SETFORMICON,Self,Pointer(GetIconHandle));
 end;
 
+{------------------------------------------------------------------------------
+  function TCustomForm.IsKeyPreviewStored: boolean;
+ ------------------------------------------------------------------------------}
+function TCustomForm.IsKeyPreviewStored: boolean;
+begin
+  Result:=FKeyPreview=true;
+end;
+
 {------------------------------------------------------------------------------
   Method: TCustomForm.SetIcon
   Params: the new icon
@@ -1406,6 +1414,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.97  2003/04/20 16:32:58  mattias
+  published keypreview
+
   Revision 1.96  2003/04/16 22:11:35  mattias
   fixed codetools Makefile, fixed default prop not found error