diff --git a/lcl/grids.pas b/lcl/grids.pas
index fa39c0d766..d0c1bd5d36 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -56,6 +56,7 @@ const
   GM_SETMASK    = LM_INTERFACELAST + 105;
   GM_SETPOS     = LM_INTERFACELAST + 106;
   GM_READY      = LM_INTERFACELAST + 107;
+  GM_GETGRID    = LM_INTERFACELAST + 108;
 
 
 const
@@ -64,6 +65,7 @@ const
   EO_HOOKKEYPRESS =   $4;
   EO_HOOKKEYUP    =   $8;
   EO_SELECTALL    =   $10;
+  EO_IMPLEMENTED  =   $20;
 
 const
   DEFCOLWIDTH     = 64;
@@ -196,6 +198,7 @@ type
     procedure msg_SetGrid(var Msg: TGridMessage); message GM_SETGRID;
     procedure msg_SelectAll(var Msg: TGridMessage); message GM_SELECTALL;
     procedure msg_SetPos(var Msg: TGridMessage); message GM_SETPOS;
+    procedure msg_GetGrid(var Msg: TGridMessage); message GM_GETGRID;
   public
     procedure EditingDone; override;
   end;
@@ -211,6 +214,7 @@ type
     procedure msg_SetBounds(var Msg: TGridMessage); message GM_SETBOUNDS;
     procedure msg_SetPos(var Msg: TGridMessage); message GM_SETPOS;
     procedure msg_Ready(var Msg: TGridMessage); message GM_READY;
+    procedure msg_GetGrid(var Msg: TGridMessage); message GM_GETGRID;
   public
     property Col: Integer read FCol;
     property Row: Integer read FRow;
@@ -233,6 +237,7 @@ type
     procedure msg_SetGrid(var Msg: TGridMessage); message GM_SETGRID;
     procedure msg_SetValue(var Msg: TGridMessage); message GM_SETVALUE;
     procedure msg_SetPos(var Msg: TGridMessage); message GM_SETPOS;
+    procedure msg_GetGrid(var Msg: TGridMessage); message GM_GETGRID;
   public
     procedure EditingDone; override;
     property BorderStyle;
@@ -263,6 +268,7 @@ type
     procedure msg_SelectAll(var Msg: TGridMessage); message GM_SELECTALL;
     procedure CMControlChange(var Message: TLMEssage); message CM_CONTROLCHANGE;
     procedure msg_SetPos(var Msg: TGridMessage); message GM_SETPOS;
+    procedure msg_GetGrid(var Msg: TGridMessage); message GM_GETGRID;
     procedure VisibleChanging; override;
     function  SendChar(AChar: TUTF8Char): Integer;
     procedure WndProc(var TheMessage : TLMessage); override;
@@ -8733,6 +8739,12 @@ begin
   FRow := Msg.Row;
 end;
 
+procedure TStringCellEditor.msg_GetGrid(var Msg: TGridMessage);
+begin
+  Msg.Grid := FGrid;
+  Msg.Options:= EO_IMPLEMENTED;
+end;
+
 { TStringGridStrings }
 
 function TStringGridStrings.ConvertIndexLineCol(Index: Integer; var Line, Col: Integer): boolean;
@@ -10911,6 +10923,12 @@ begin
   Width := DEFBUTTONWIDTH;
 end;
 
+procedure TButtonCellEditor.msg_GetGrid(var Msg: TGridMessage);
+begin
+  Msg.Grid := FGrid;
+  Msg.Options:= EO_IMPLEMENTED;
+end;
+
 { TPickListCellEditor }
 procedure TPickListCellEditor.WndProc(var TheMessage: TLMessage);
 begin
@@ -11082,6 +11100,12 @@ begin
   FRow := Msg.Row;
 end;
 
+procedure TPickListCellEditor.msg_GetGrid(var Msg: TGridMessage);
+begin
+  Msg.Grid := FGrid;
+  Msg.Options:= EO_IMPLEMENTED;
+end;
+
 { TCompositeCellEditor }
 
 procedure TCompositeCellEditor.DispatchMsg(msg: TGridMessage);
@@ -11194,6 +11218,12 @@ begin
   DispatchMsg(Msg);
 end;
 
+procedure TCompositeCellEditor.msg_GetGrid(var Msg: TGridMessage);
+begin
+  Msg.Grid := FGrid;
+  Msg.Options:= EO_IMPLEMENTED;
+end;
+
 procedure TCompositeCellEditor.VisibleChanging;
 var
   i: Integer;
diff --git a/lcl/widgetset/wsgrids.pp b/lcl/widgetset/wsgrids.pp
index 2a584d03de..59a4775292 100644
--- a/lcl/widgetset/wsgrids.pp
+++ b/lcl/widgetset/wsgrids.pp
@@ -44,7 +44,7 @@ uses
 // To get as little as posible circles,
 // uncomment only when needed for registration
 ////////////////////////////////////////////////////
-  Controls, LCLType, Grids,
+  LCLType, Controls, StdCtrls, Grids,
 ////////////////////////////////////////////////////
   WSLCLClasses, WSControls, WSFactory;
 
@@ -72,13 +72,33 @@ class procedure TWSCustomGrid.SendCharToEditor(AEditor:TWinControl;
   Ch: TUTF8Char);
 var
   GMsg: TGridMessage;
+  GridEditor: boolean;
 begin
+  GMsg.Grid := nil;
+  GMsg.Options:= 0;
+  GMsg.LclMsg.Msg:=GM_GETGRID;
+  AEditor.Dispatch(GMsg);
+  GridEditor := (GMsg.Options and EO_IMPLEMENTED<>0) and (GMsg.Grid<>nil);
+
   GMsg.LclMsg.Msg:=GM_SETVALUE;
   if Ch=#8 then // backspace
     GMsg.Value:=''
   else
     GMsg.Value:=Ch;
-  AEditor.Dispatch(GMsg);
+
+  if GridEditor then
+    AEditor.Dispatch(GMsg)
+  else begin
+    // TODO: Find a generic way ...
+    if AEditor is TCustomEdit then begin
+      TCustomEdit(AEditor).Text:=GMsg.Value;
+      TCustomEdit(AEditor).SelStart:=UTF8Length(GMsg.Value);
+    end else
+    if AEditor is TCustomCombobox then begin
+      TCustomCombobox(AEditor).Text:=GMsg.Value;
+      TCustomCombobox(AEditor).SelStart:=UTF8Length(GMsg.Value);
+    end;
+  end;
 end;
 
 class function TWSCustomGrid.InvalidateStartY(const FixedHeight, RowOffset: Integer): Integer;