diff --git a/components/codetools/stdcodetools.pas b/components/codetools/stdcodetools.pas
index dadd22a2f6..8624944766 100644
--- a/components/codetools/stdcodetools.pas
+++ b/components/codetools/stdcodetools.pas
@@ -3113,6 +3113,8 @@ begin
   ReadNextAtom;
   if AtomIsChar('(') then begin
     ReadNextAtom;
+    if UpAtomIs('SPECIALIZE') then
+      ReadNextAtom;
     if AtomIsIdentifier then
       AncestorClassName:=GetAtom;
   end;
diff --git a/lcl/grids.pas b/lcl/grids.pas
index 37914e2868..24c62c6fc6 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -7079,6 +7079,7 @@ begin
   {$ifdef dbgGrid}DebugLnEnter('grid.DoEditorHide [',Editor.ClassName,'] INIT');{$endif}
   if gfEditingDone in FGridFlags then begin
     ParentForm := GetParentForm(Self);
+    if Self.CanFocus then
     ParentForm.ActiveControl := self;
   end;
   Editor.Visible:=False;