diff --git a/ideintf/objectinspector.pp b/ideintf/objectinspector.pp
index 94fe53d47b..591c55c27d 100644
--- a/ideintf/objectinspector.pp
+++ b/ideintf/objectinspector.pp
@@ -2044,21 +2044,21 @@ begin
   then begin
     RRect := RowRect(ItemIndex);
     EditCompRect := RRect;
+    EditCompRect.Bottom := EditCompRect.Bottom - 1;
 
     if Layout = oilHorizontal
     then begin
-      EditCompRect.Top := RRect.Top - 1;
       EditCompRect.Left := RRect.Left + SplitterX;
     end
     else begin
-      EditCompRect.Top := RRect.Top + GetNameRowHeight - 1;
+      EditCompRect.Top := RRect.Top + GetNameRowHeight;
       EditCompRect.Left := RRect.Left + GetTreeIconX(ItemIndex) + Indent;
     end;
 
     if FCurrentButton<>nil then begin
       // edit dialog button
       with EditBtnRect do begin
-        Top := EditCompRect.Top + 1;
+        Top := EditCompRect.Top;
         Left := EditCompRect.Right - 20;
         Bottom := EditCompRect.Bottom;
         Right := EditCompRect.Right;
@@ -2071,7 +2071,9 @@ begin
     end;
     if FCurrentEdit<>nil then begin
       // resize the edit component
-      EditCompRect.Left := EditCompRect.Left - 1;
+      Dec(EditCompRect.Left);
+      Dec(EditCompRect.Top);
+      Inc(EditCompRect.Bottom);
       //debugln('TOICustomPropertyGrid.AlignEditComponents A ',dbgsName(FCurrentEdit),' ',dbgs(EditCompRect));
       if not CompareRectangles(FCurrentEdit.BoundsRect,EditCompRect) then begin
         FCurrentEdit.BoundsRect:=EditCompRect;
@@ -2112,6 +2114,14 @@ begin
   ValueRect := FullRect;
   Inc(FullRect.Bottom, FRowSpacing);
 
+  if ARow = FItemIndex then begin
+    if Assigned(FCurrentButton) and (FCurrentButton.Visible) then
+      Dec(FullRect.Right, FCurrentButton.Width);
+
+    if Assigned(FCurrentEdit) and (FCurrentEdit.Visible) then
+      Dec(FullRect.Right, FCurrentEdit.Width);
+  end;
+
   if Layout = oilHorizontal
   then begin
     NameRect.Right:=SplitterX;
diff --git a/lcl/include/customlabelededit.inc b/lcl/include/customlabelededit.inc
index cddd65254e..4cf75c03e9 100644
--- a/lcl/include/customlabelededit.inc
+++ b/lcl/include/customlabelededit.inc
@@ -112,6 +112,7 @@ procedure TCustomLabeledEdit.CreateInternalLabel;
 begin
   if FEditLabel<>nil then exit;
   FEditLabel := TBoundLabel.Create(Self);
+  //Include(FEditLabel.ComponentStyle,csSubComponent);
   FEditLabel.ControlStyle := FEditLabel.ControlStyle + [csNoDesignSelectable];
   FEditLabel.FreeNotification(Self);
   FEditLabel.FocusControl := Self;
diff --git a/lcl/lclmessageglue.pas b/lcl/lclmessageglue.pas
index d8608fa2d0..f756dc41a6 100644
--- a/lcl/lclmessageglue.pas
+++ b/lcl/lclmessageglue.pas
@@ -85,6 +85,7 @@ function LCLSendMouseMultiClickMsg(const Target: TControl; XPos, YPos: SmallInt;
 function LCLSendDrawListItemMsg(const Target: TControl; const DrawListItemStruct: PDrawListItemStruct): PtrInt;
 function LCLSendInternalPaintMsg(const Target: TControl; DC: HDC): PtrInt;
 function LCLSendDropDownMsg(const Target: TControl): PtrInt;
+function LCLSendCloseUpMsg(const Target: TControl): PtrInt;
 
 implementation
 
@@ -1240,6 +1241,17 @@ begin
   Result := DeliverMessage(Target, Mess);
 end;
 
+function LCLSendCloseUpMsg(const Target: TControl): PtrInt;
+var
+  Mess : TLMCommand;
+begin
+  FillChar(Mess, SizeOf(Mess), 0);
+  Mess.Msg := CN_Command;
+  Mess.NotifyCode := CBN_CLOSEUP;
+
+  Result := DeliverMessage(Target, Mess);
+end;
+
 
 // Remove these lines as you implement the function