diff --git a/lcl/dbgrids.pas b/lcl/dbgrids.pas
index 1affef7750..edf942dbb8 100644
--- a/lcl/dbgrids.pas
+++ b/lcl/dbgrids.pas
@@ -307,6 +307,7 @@ type
     FTempText : string;
     FDrawingActiveRecord: Boolean;
     FEditingColumn: Integer;
+    FEditingField: TField;
     function GetCurrentField: TField;
     function GetDataSource: TDataSource;
     procedure OnRecordChanged(Field:TField);
@@ -357,14 +358,13 @@ type
     
     procedure OnTitleFontChanged(Sender: TObject);
     procedure RestoreEditor;
+    function  ISEOF: boolean;
   protected
   {$ifdef ver1_0}
     property FixedColor;
   {$endif}
     procedure BeforeMoveSelection(const DCol,DRow: Integer); override;
     procedure BeginLayout;
-    procedure EditingColumn(aCol: Integer; Ok: boolean);
-    procedure EditorCancelEditing;
     procedure CellClick(const aCol,aRow: Integer); override;
     procedure ChangeBounds(ALeft, ATop, AWidth, AHeight: integer); override;
     procedure ColRowMoved(IsColumn: Boolean; FromIndex,ToIndex: Integer); override;
@@ -377,14 +377,19 @@ type
     procedure DoExit; override;
     procedure DoOnChangeBounds; override;
     procedure DrawByRows; override;
+    procedure DrawFocusRect(aCol,aRow:Integer; ARect:TRect); override;
     procedure DrawRow(ARow: Integer); override;
     procedure DrawCell(aCol,aRow: Integer; aRect: TRect; aState:TGridDrawState); override;
     procedure EditButtonClicked(Sender: TObject);
+    procedure EditingColumn(aCol: Integer; Ok: boolean);
+    procedure EditorCancelEditing;
+    procedure EditordoGetValue; override;
     function  EditorCanAcceptKey(const ch: Char): boolean; override;
     function  EditorIsReadOnly: boolean; override;
     procedure EndLayout;
     function  GetEditMask(aCol, aRow: Longint): string; override;
     function  GetEditText(aCol, aRow: Longint): string; override;
+    function  GridCanModify: boolean;
     procedure HeaderClick(IsColumn: Boolean; index: Integer); override;
     procedure HeaderSized(IsColumn: Boolean; Index: Integer); override;
     procedure KeyDown(var Key : Word; Shift : TShiftState); override;
@@ -724,10 +729,12 @@ begin
     else
       Exclude(OldOptions, goRowSelect);
 
+    {
     if dgAlwaysShowSelection in FOptions then
       Include(OldOptions, goDrawFocusSelected)
     else
       Exclude(OldOptions, goDrawFocusSelected);
+    }
 
     if dgEditing in FOptions then
       Include(OldOptions, goEditing)
@@ -778,6 +785,7 @@ begin
     SelField := SelectedField;
     edField := GetFieldFromGridColumn(FEditingColumn);
     if (edField<>nil) and (edField = SelField) then
+    //if (edField<>nil) and (FEditingField=SelField) then
       edField.AsString := FTempText;
   end;
 end;
@@ -984,14 +992,22 @@ var
 begin
   if csDestroying in ComponentState then
     exit;
+  if not HandleAllocated then
+    exit;
   Count := UpdateGridCounts;
   if Count=0 then
     Clear
   else begin
+    if not FDatalink.Active or not FDatalink.Dataset.Active then
+      NumRows := RowCount
+    else
+      NumRows := FDataLink.DataSet.RecordCount + FixedRows;
+    {
     if FDataLink.Active then
       NumRows := FDataLink.DataSet.RecordCount + FixedRows
     else
       NumRows := RowCount;
+    }
     ScrollBarRange(SB_HORZ, GridWidth + 2);
     ScrollBarRange(SB_VERT, NumRows * DefaultRowHeight + 2);
   end;
@@ -1029,6 +1045,19 @@ begin
   end;
 end;
 
+// Workaround: dataset is not EOF after Append!
+type
+  TMyDs=class(TDataSet)
+  end;
+
+function TCustomDbGrid.IsEOF: boolean;
+begin
+  with FDatalink do
+    result :=
+      Active and
+      (TMyDS(Dataset).GetBookmarkFlag(DataSet.ActiveBuffer) = bfEOF);
+end;
+
 function TCustomDbGrid.GetColumnTitle(Column: Integer): string;
 var
   F: Tfield;
@@ -1219,6 +1248,14 @@ procedure TCustomDbGrid.DefaultDrawCell(aCol, aRow: Integer; aRect: TRect;
     else
       result := dsInactive;
   end;
+  procedure FixRectangle;
+  begin
+    case Canvas.TextStyle.Alignment of
+      Classes.taLeftJustify: Inc(aRect.Left, 3);
+      Classes.taRightJustify: Dec(aRect.Right, 3);
+    end;
+    Inc(aRect.Top, 2);
+  end;
 var
   S: string;
   F: TField;
@@ -1228,7 +1265,8 @@ begin
       DrawArrow(Canvas, aRect, GetDataSetState)
     else
     if (aRow=0)and(ACol>=FixedCols) then begin
-      Canvas.TextRect(ARect,ARect.Left+2,ARect.Top+2,GetColumnTitle(aCol));
+      FixRectangle;
+      Canvas.TextRect(ARect,ARect.Left,ARect.Top,GetColumnTitle(aCol));
     end;
   end else begin
     F := GetFieldFromGridColumn(aCol);
@@ -1236,8 +1274,8 @@ begin
       S := F.DisplayText;
     end else
       S := '';
-    Canvas.TextRect(Arect,ARect.Left+2,ARect.Top+2, S);
-    //Canvas.TextOut(aRect.Left+2,ARect.Top+2, S);
+    FixRectangle;
+    Canvas.TextRect(Arect,ARect.Left,ARect.Top, S);
   end;
 end;
 
@@ -1285,17 +1323,50 @@ procedure TCustomDbGrid.KeyDown(var Key: Word; Shift: TShiftState);
     if Assigned(OnKeyDown) then
       OnKeyDown(Self, Key, Shift);
   end;
-  procedure MoveBy(Delta: Integer);
-  begin
-    doOnKeyDown;
-    FDatalink.MoveBy(Delta);
-  end;
 begin
   case Key of
-    VK_DOWN: MoveBy(1);
-    VK_UP: MoveBy(-1);
-    VK_NEXT: MoveBy( VisibleRowCount );
-    VK_PRIOR: MoveBy( -VisibleRowCount );
+    VK_DOWN:
+      if FDatalink.DataSet <> nil then
+      with FDatalink.Dataset do begin
+        DoOnKeyDown;
+        Key := 0;
+        if (State=dsInsert)and not (Modified or FDataLink.FModified) then begin
+          if IsEOF then
+            exit
+          else
+            cancel;
+        end else begin
+          FDatalink.MoveBy(1);
+          if GridCanModify and FDataLink.EOF then
+            Append;
+        end;
+      end;
+      
+    VK_UP:
+      if FDataLink.DataSet <> nil then
+      with FDataLink.DataSet do begin
+        doOnKeyDown;
+        if (State=dsInsert) and IsEOF and not (Modified or FDataLink.FModified) then
+          cancel
+        else
+          FDatalink.MoveBy(-1);
+        key := 0;
+      end;
+      
+    VK_NEXT:
+      begin
+        doOnKeyDown;
+        FDatalink.MoveBy( VisibleRowCount );
+        Key := 0;
+      end;
+      
+    VK_PRIOR:
+      begin
+        doOnKeyDown;
+        FDatalink.MoveBy( -VisibleRowCount );
+        key := 0;
+      end;
+      
     VK_ESCAPE:
       begin
         doOnKeyDown;
@@ -1304,9 +1375,42 @@ begin
         else
           if FDataLink.Active then
             FDataLink.DataSet.Cancel;
+        Key:=0;
+      end;
+      
+    VK_INSERT:
+      begin
+        doOnKeyDown;
+        if GridCanModify then
+          FDataLink.DataSet.Insert;
+        Key:=0;
+      end;
+      
+    VK_HOME:
+      begin
+        doOnKeyDown;
+        if FDatalink.Active then begin
+          if ssCTRL in Shift then
+            FDataLink.DataSet.First
+          else
+            MoveNextSelectable(False, FixedCols, Row);
+        end;
+        Key:=0;
+      end;
+      
+    VK_END:
+      begin
+        doOnKeyDown;
+        if FDatalink.Active then begin
+          if ssCTRL in shift then
+            FDatalink.DataSet.Last
+          else
+            MoveNextSelectable(False, ColCount-1, Row);
+        end;
+        Key:=0;
       end;
     else
-      inherited;
+      inherited KeyDown(Key, Shift);
   end;
 end;
 
@@ -1350,24 +1454,24 @@ begin
   inherited PrepareCanvas(aCol, aRow, aState);
   // we get the default canvas values
   // now, modify canvas according to column values
+  TheAlignment := GetColumnAlignment(ACol, ForTitle);
+  case TheAlignment of
+    taRightJustify: Canvas.TextStyle.Alignment := Classes.taRightJustify;
+    taCenter: Canvas.TextStyle.Alignment := Classes.taCenter;
+    taLeftJustify: Canvas.TextStyle.Alignment := classes.taLeftJustify;
+  end;
+  Canvas.TextStyle.Layout := GetColumnLayout(aCol, ForTitle);
   if gdSelected in aState then begin
     // what to do in selected state?
     //Canvas.Brush.Color := GetColumnColor(ACol, false);
   end else begin
     ForTitle := gdFixed in aState;
     Canvas.Brush.Color := GetColumnColor(ACol, ForTitle);
-    TheAlignment := GetColumnAlignment(ACol, ForTitle);
     aFont := GetColumnFont(ACol, ForTitle);
     if aFont<>FLastFont then begin
       Canvas.Font := aFont;
       FLastFont := aFont;
     end;
-    case TheAlignment of
-      taRightJustify: Canvas.TextStyle.Alignment := Classes.taRightJustify;
-      taCenter: Canvas.TextStyle.Alignment := Classes.taCenter;
-      taLeftJustify: Canvas.TextStyle.Alignment := classes.taLeftJustify;
-    end;
-    Canvas.TextStyle.Layout := GetColumnLayout(aCol, ForTitle);
   end;
   OnPrepareCanvas := OldOnEvent;
   if Assigned(OnPrepareCanvas) then
@@ -1437,12 +1541,19 @@ end;
 
 procedure TCustomDbGrid.EditorCancelEditing;
 begin
+  EditingColumn(FEditingColumn, False);
   if EditorMode then begin
     EditorMode := False;
     if dgAlwaysShowEditor in Options then
       EditorMode := True;
   end;
-  EditingColumn(FEditingColumn, EditorMode);
+end;
+
+procedure TCustomDbGrid.EditordoGetValue;
+begin
+  inherited EditordoGetValue;
+  UpdateData;
+  EditingColumn(FEditingColumn, False);
 end;
 
 procedure TCustomDbGrid.CellClick(const aCol, aRow: Integer);
@@ -1465,11 +1576,13 @@ end;
 
 procedure TCustomDbGrid.DoExit;
 begin
-  if FDataLink.Active then begin
-    if (FDataLink.DataSet.State=dsInsert) and (dgCancelOnExit in Options)
-    then begin
-      FDataLink.DataSet.Cancel;
-      EditorCancelEditing;
+  if not EditorShowing then begin
+    if FDataLink.Active then begin
+      if (FDataLink.DataSet.State=dsInsert) and (dgCancelOnExit in Options)
+      then begin
+        FDataLink.DataSet.Cancel;
+        EditorCancelEditing;
+      end;
     end;
   end;
   inherited DoExit;
@@ -1503,6 +1616,12 @@ begin
   end;
 end;
 
+function TCustomDbGrid.GridCanModify: boolean;
+begin
+  result := not ReadOnly and (dgEditing in Options) and not FDataLink.ReadOnly
+    and FDataLink.Active and FDatalink.DataSet.CanModify;
+end;
+
 procedure TCustomDbGrid.MoveSelection;
 begin
   if FSelectionLock then
@@ -1533,6 +1652,17 @@ begin
       FDataLink.ActiveRecord:=CurActiveRecord;
   end;
 end;
+
+procedure TCustomDbGrid.DrawFocusRect(aCol, aRow: Integer; ARect: TRect);
+begin
+  // Draw focused cell if we have the focus
+  if {Self.Focused and }(dgAlwaysShowSelection in Options) then
+  begin
+    CalcFocusRect(aRect);
+    DrawRubberRect(Canvas, aRect, FocusColor);
+  end;
+end;
+
 // 33 31 21 29 80 90 4 3
 procedure TCustomDbGrid.DrawRow(ARow: Integer);
 begin
@@ -1664,11 +1794,11 @@ begin
   FColumns := CreateColumns;
 
   FOptions := [dgColumnResize, dgTitles, dgIndicator, dgRowLines, dgColLines,
-    dgConfirmDelete, dgCancelOnExit, dgTabs, dgEditing];
+    dgConfirmDelete, dgCancelOnExit, dgTabs, dgEditing, dgAlwaysShowSelection];
     
   inherited Options :=
     [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect,
-     goSmoothScroll, goColMoving, goTabs, goEditing ];
+     goSmoothScroll, goColMoving, goTabs, goEditing, goDrawFocusSelected ];
 
   
   // What a dilema!, we need ssAutoHorizontal and ssVertical!!!
@@ -1703,16 +1833,27 @@ procedure TCustomDbGrid.DefaultDrawColumnCell(const Rect: TRect;
     else
       result := dsInactive;
   end;
+  function FixRectangle: TRect;
+  begin
+    result := Rect;
+    case Canvas.TextStyle.Alignment of
+      Classes.taLeftJustify: Inc(Result.Left, 3);
+      Classes.taRightJustify: Dec(Result.Right, 3);
+    end;
+    Inc(Result.Top, 2);
+  end;
 var
   S: string;
   F: TField;
+  R: TRect;
 begin
   if gdFixed in State then begin
     if (DataCol=0)and FDrawingActiveRecord then
       DrawArrow(Canvas, Rect, GetDataSetState)
     else
     if (DataCol>=FixedCols) then begin
-      Canvas.TextRect(Rect,Rect.Left+2,Rect.Top+2,GetColumnTitle(DataCol));
+      R := FixRectangle();
+      Canvas.TextRect(R,R.Left,R.Top,GetColumnTitle(DataCol));
     end;
   end else begin
     F := GetFieldFromGridColumn(DataCol);
@@ -1720,7 +1861,8 @@ begin
       S := F.DisplayText;
     end else
       S := '';
-    Canvas.TextRect(Rect,Rect.Left+2,Rect.Top+2,S);
+    R := FixRectangle();
+    Canvas.TextRect(R,R.Left,R.Top,S);
     //Canvas.TextOut(aRect.Left+2,ARect.Top+2, S);
   end;
 end;
@@ -2546,6 +2688,9 @@ end.
 
 {
   $Log$
+  Revision 1.19  2004/10/09 12:16:20  mattias
+  From Jesus: Ctrl+HOME does dataset.first, ctrl+END does dataSet.Last and fixes
+
   Revision 1.18  2004/09/24 13:45:31  mattias
   fixed TCanvas.TextRect Delphi compatible Rect and added TBarChart from Michael VC
 
diff --git a/lcl/grids.pas b/lcl/grids.pas
index ab625d11e3..44b62d9728 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -381,6 +381,7 @@ type
     fGridState: TGridState;
     procedure AutoAdjustColumn(aCol: Integer); virtual;
     procedure BeforeMoveSelection(const DCol,DRow: Integer); virtual;
+    procedure CalcFocusRect(var ARect: TRect);
     procedure CellClick(const aCol,aRow: Integer); virtual;
     procedure CheckLimits(var aCol,aRow: Integer);
     procedure ColRowDeleted(IsColumn: Boolean; index: Integer); dynamic;
@@ -393,9 +394,9 @@ type
     procedure DblClick; override;
     procedure DefineProperties(Filer: TFiler); override;
     procedure DestroyHandle; override;
-    procedure DoOnChangeBounds; override;
     procedure DoExit; override;
     procedure DoEnter; override;
+    procedure DoOnChangeBounds; override;
     procedure DrawBackGround; virtual;
     procedure DrawBorder;
     procedure DrawByRows; virtual;
@@ -432,6 +433,7 @@ type
     procedure MouseMove(Shift: TShiftState; X,Y: Integer);override;
     procedure MouseUp(Button: TMouseButton; Shift:TShiftState; X,Y:Integer); override;
     function  MoveExtend(Relative: Boolean; DCol, DRow: Integer): Boolean;
+    function  MoveNextAuto: boolean;
     function  MoveNextSelectable(Relative:Boolean; DCol, DRow: Integer): Boolean;
     procedure MoveSelection; virtual;
     function  OffsetToColRow(IsCol,Fisical:Boolean; Offset:Integer; var Rest:Integer): Integer;
@@ -473,6 +475,8 @@ type
     property DragDx: Integer read FDragDx write FDragDx;
     property Editor: TWinControl read FEditor write SetEditor;
     property EditorMode: Boolean read FEditorMode write EditorSetMode;
+    property EditorKey: boolean read FEditorKey write FEditorKey;
+    property EditorShowing: boolean read FEditorShowing;
     property FixedCols: Integer read FFixedCols write SetFixedCols default 1;
     property FixedRows: Integer read FFixedRows write SetFixedRows default 1;
     property FixedColor: TColor read GetFixedColor write SetFixedcolor;
@@ -842,19 +846,29 @@ end;
 procedure DrawRubberRect(Canvas: TCanvas; aRect: TRect; Color: TColor);
   procedure DrawVertLine(X1,Y1,Y2: integer);
   begin
-    if Y2<Y1 then SwapInt(Y1, Y2);
-    while Y1<Y2 do begin
-      Canvas.Pixels[X1, Y1] := Color;
-      inc(Y1, constRubberSpace);
-    end;
+    if Y2<Y1 then
+      while Y2<Y1 do begin
+        Canvas.Pixels[X1, Y1] := Color;
+        dec(Y1, constRubberSpace);
+      end
+    else
+      while Y1<Y2 do begin
+        Canvas.Pixels[X1, Y1] := Color;
+        inc(Y1, constRubberSpace);
+      end;
   end;
   procedure DrawHorzLine(X1,Y1,X2: integer);
   begin
-    if X2<X1 then SwapInt(X1, X2);
-    while X1<X2 do begin
-      Canvas.Pixels[X1, Y1] := Color;
-      inc(X1, constRubberSpace);
-    end;
+    if X2<X1 then
+      while X2<X1 do begin
+        Canvas.Pixels[X1, Y1] := Color;
+        dec(X1, constRubberSpace);
+      end
+    else
+      while X1<X2 do begin
+        Canvas.Pixels[X1, Y1] := Color;
+        inc(X1, constRubberSpace);
+      end;
   end;
 // var OldStyle: TPenStyle;
 begin
@@ -870,10 +884,10 @@ begin
     Canvas.LineTo(Left,    Top+1);
     Canvas.Pen.Style:=OldStyle
     }
-    DrawHorzLine(Left, Top, Right-2);
-    DrawVertLine(Right-2, Top, Bottom-2);
-    DrawHorzLine(Right-1, Bottom-2, Left);
-    DrawVertLine(Left, Bottom-2, Top);
+    DrawHorzLine(Left, Top, Right-1);
+    DrawVertLine(Right-1, Top, Bottom-1);
+    DrawHorzLine(Right-1, Bottom-1, Left);
+    DrawVertLine(Left, Bottom-1, Top);
   end;
 end;
 
@@ -1520,7 +1534,7 @@ begin
   end;
 end;
 
-{Calculate the TopLeft needed to show cell[aCol,aRow]}
+{ Scroll the grid until cell[aCol,aRow] is shown }
 function TCustomGrid.ScrollToCell(const aCol,aRow: Integer): Boolean;
 var
   RNew: TRect;
@@ -1545,11 +1559,15 @@ begin
     else if RNew.Bottom + FGCache.TLRowOff > FGCache.ClientHeight then YInc:=1;
 
     with FTopLeft do
-    if ((XInc=0)and(YInc=0)) or
-       ((X=aCol)and(y=aRow)) or // Only Perfect fit !
-       ((X+XInc>=ColCount)or(Y+Yinc>=RowCount)) or // Last Posible
-       ((X+XInc<0)or(Y+Yinc<0)) // Least Posible
-    then Break;
+    if ((XInc=0)and(YInc=0)) or // the cell is already visible
+       ((X=aCol)and(Y=aRow)) or // the cell is visible by definition
+       ((X+XInc<0)or(Y+Yinc<0)) or // topleft can't be lower 0
+       ((X+XInc>=ColCount)) or // leftmost column can't be equal/higher than colcount
+       ((Y+Yinc>=RowCount)) or // topmost column can't be equal/higher than rowcount
+       ((XInc>0)and(X=aCol)and(GetColWidths(aCol)>FGCache.ClientWidth)) or
+       ((YInc>0)and(Y=aRow)and(GetRowHeights(aRow)>FGCache.ClientHeight))
+    then
+      Break;
     Inc(FTopLeft.x, XInc);
     Inc(FTopLeft.y, YInc);
   end;
@@ -3091,17 +3109,26 @@ begin
           if Relaxed then MoveSel(False, ColCount-1, FRow)
           else            MoveSel(False, FCol, RowCount-1);
       end;
-    VK_F2, VK_RETURN:
+    VK_F2: //, VK_RETURN:
       begin
-        EditorShow(Key=VK_RETURN);
+        EditorShow(False);
         // if Key=VK_RETURN then EditorSelectAll;
         Key:=0;
       end;
+    VK_RETURN:
+      begin
+        if not FEditorKey then begin
+          EditorShow(True);
+          Key := 0;
+        end;
+      end;
     VK_BACK:
       begin
         // Workaround: LM_CHAR doesnt trigger with BACKSPACE
-        EditorShowChar(^H);
-        key:=0;
+        if not FEditorKey then begin
+          EditorShowChar(^H);
+          key:=0;
+        end;
       end;
 
     {$IfDef Dbg}
@@ -3238,6 +3265,25 @@ begin
   {$IfDef dbgFocus}DebugLn(' MoveExtend FIN FCol= ',FCol, ' FRow= ',FRow);{$Endif}
 end;
 
+function TCustomGrid.MoveNextAuto: boolean;
+var
+  aCol,aRow: Integer;
+begin
+  aCol := 0;
+  aRow := 0;
+  case FAutoAdvance of
+    aaRight: ACol := integer(FCol<ColCount-1);
+    aaDown : ARow := integer(FRow<RowCount-1);
+    aaLeft : ACol := -integer(FCol>FixedCols);
+  end;
+  result := (aCol<>0) or (aRow<>0);
+  if result then begin
+    FGCache.TLColOff:=0;
+    FGCache.TLRowOff:=0;
+    MoveNextSelectable(true, aCol, aRow);
+  end;
+end;
+
 function TCustomGrid.MoveNextSelectable(Relative: Boolean; DCol, DRow: Integer
   ): Boolean;
 var
@@ -3265,6 +3311,7 @@ begin
   if DRow<0 then RInc:=-1 else
   if DRow>0 then RInc:= 1
   else           RInc:= 0;
+  
   // Calculation
   SelOk:=SelectCell(NCol,NRow);
   Result:=False;
@@ -3352,6 +3399,30 @@ begin
   if Assigned(OnBeforeSelection) then OnBeforeSelection(Self, DCol, DRow);
 end;
 
+procedure TCustomGrid.CalcFocusRect(var ARect: TRect);
+{
+var
+  dx,dy: integer;
+}
+begin
+  if goRowSelect in Options then begin
+    aRect.Left := FGCache.FixedWidth + 1;
+    aRect.Right := FGCache.MaxClientXY.x;
+  end;
+  if goHorzLine in Options then dec(aRect.Bottom, 1);
+  if goVertLine in Options then dec(aRect.Right, 1);
+  {
+  if not (goHorzLine in Options) then begin
+    aRect.Bottom := aRect.Bottom + 1;
+    Dec(aRect.Botton, 1);
+  end;
+  if not (goVertLine in Options) then begin
+    aRect.Right := aRect.Right + 1;
+    Dec(aRect.Botton, 1);
+  end;
+  }
+end;
+
 procedure TCustomGrid.CellClick(const aCol, aRow: Integer);
 begin
 end;
@@ -3583,30 +3654,72 @@ end;
 procedure TCustomGrid.EditorKeyDown(Sender: TObject; var Key:Word; Shift:TShiftState);
 begin
   FEditorKey:=True; // Just a flag to see from where the event comes
+  KeyDown(Key, shift);
   case Key of
     VK_LEFT, VK_RIGHT, VK_UP, VK_DOWN,
     VK_PRIOR, VK_NEXT:
     begin
-      if not(ssShift in Shift) then KeyDown(Key, Shift);
+      if ssShift in Shift then
+        exit;
     end;
-    VK_RETURN, VK_TAB:
+    VK_TAB:
+      begin
+        if GoTabs in Options then
+          MoveNextAuto;
+      end;
+    VK_RETURN:
+      begin
+        if not MoveNextAuto then begin
+          EditorGetValue;
+          if EditorAlwaysShown then
+            EditorShow(True);
+        end;
+
+        {
+        case FAutoAdvance of
+          aaRight: Key:=VK_RIGHT * Integer( FCol<ColCount-1 );
+          aaDown : Key:=VK_DOWN * Integer( FRow<RowCount-1 );
+          aaLeft : Key:=VK_LEFT * Integer( FCol>FixedCols );
+          else Key := 0;
+        end;
+        if Key=0 then begin
+          EditorGetValue;
+          if EditorAlwaysShown then
+            EditorShow(true);
+        end;
+        }
+      end;
+  end;
+  (*
+  case Key of
+    VK_LEFT, VK_RIGHT, VK_UP, VK_DOWN,
+    VK_PRIOR, VK_NEXT:
     begin
+      if not(ssShift in Shift) then
+        KeyDown(Key, Shift);
+    end;
+    VK_RETURN{, VK_TAB}:
+    begin
+      {
       if (Key=VK_TAB) and not (goTabs in Options) then begin
           // let the focus go
           KeyDown(Key, Shift);
           //DebugLn('Editor KeyTab Pressed, Focus Should leave the grid');
           Exit;
       end;
-      Key:=0;
+      }
+      //Key:=0;
       case FAutoAdvance of
         aaRight: Key:=VK_RIGHT * Integer( FCol<ColCount-1 );
         aaDown : Key:=VK_DOWN * Integer( FRow<RowCount-1 );
         aaLeft : Key:=VK_LEFT * Integer( FCol>FixedCols );
+        else Key := 0;
       end;
+      
       if Key=0 then begin
         EditorGetValue;
-        EditorShow(EditorAlwaysShown);
-        // Select All !
+        if EditorAlwaysShown then
+          EditorShow(true);
       end else
         KeyDown(Key, Shift);
     end;
@@ -3614,6 +3727,7 @@ begin
     else
       KeyDown(Key, Shift);
   end;
+  *)
   FEditorKey:=False;
 end;
 
@@ -4309,12 +4423,41 @@ procedure TStringCellEditor.KeyDown(var Key: Word; Shift: TShiftState);
     if FGrid<>nil then
       FGrid.EditorkeyDown(Self, key, shift);
   end;
+  procedure doGridKeyDown;
+  begin
+    if FGrid<>nil then
+      FGrid.KeyDown(Key, shift);
+  end;
 var
   IntSel: boolean;
 begin
   {$IfDef dbg}
   DebugLn('INI: Key=',Key,' SelStart=',SelStart,' SelLenght=',SelLength);
   {$Endif}
+  inherited KeyDown(Key,Shift);
+  case Key of
+    VK_LEFT, VK_RIGHT, VK_UP, VK_DOWN:
+      begin
+        IntSel:= ((Key=VK_LEFT) and not AtStart) or ((Key=VK_RIGHT) and not AtEnd);
+        if not IntSel then begin
+          doGridKeyDown;
+        end;
+      end;
+    else begin
+      doEditorKeyDown;
+    end;
+  end;
+
+  {
+  case Key of
+    VK_RETURN:
+      begin
+        doEditorKeyDown;
+        Key := 0;
+      end;
+  end;
+  }
+  {
   case Key of
     VK_RETURN:
       if AllSelected then begin
@@ -4336,7 +4479,7 @@ begin
     end;
   end;
   inherited KeyDown(key, shift);
-  
+  }
 
   {
   if FGrid<>nil then begin
@@ -4407,16 +4550,7 @@ begin
   // Draw focused cell if we have the focus
   if Self.Focused or (EditorAlwaysShown and ((Feditor=nil) or not Feditor.Focused)) then
   begin
-    if goRowSelect in Options then begin
-      aRect.Left := FGCache.FixedWidth + 1;
-      aRect.Right := FGCache.MaxClientXY.x;
-    end;
-    if not (goHorzLine in Options) then begin
-      aRect.Bottom := aRect.Bottom + 1;
-    end;
-    if not (goVertLine in Options) then begin
-      aRect.Right := aRect.Right + 1;
-    end;
+    CalcFocusRect(aRect);
     DrawRubberRect(Canvas, aRect, FFocusColor);
   end;
 end;