diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp
index 6740d5f7bd..ec70e907de 100644
--- a/components/ideintf/objectinspector.pp
+++ b/components/ideintf/objectinspector.pp
@@ -622,6 +622,7 @@ type
     CompFilterEdit: TTreeFilterEdit;
     PnlClient: TPanel;
     StatusBar: TStatusBar;
+    procedure FormResize(Sender: TObject);
     procedure MainPopupMenuClose(Sender: TObject);
     procedure MainPopupMenuPopup(Sender: TObject);
     procedure AvailComboBoxCloseUp(Sender: TObject);
@@ -4979,6 +4980,11 @@ begin
   if FStateOfHintsOnMainPopupMenu then ShowHintPopupMenuItemClick(nil);
 end;
 
+procedure TObjectInspectorDlg.FormResize(Sender: TObject);
+begin
+  ComponentPanel.Constraints.MaxHeight := Height-50;
+end;
+
 procedure TObjectInspectorDlg.GridKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 var