diff --git a/components/jujiboutils/changes.txt b/components/jujiboutils/changes.txt
index 907e11c7d..b9ebd5f5a 100644
--- a/components/jujiboutils/changes.txt
+++ b/components/jujiboutils/changes.txt
@@ -5,6 +5,7 @@ Note: Lazarus Trunk required
 
 Version pre-1.1
 --------------------------------------------------
+2013-04-29 Fixed:  TJDBGridControl Focus issues
 2013-01-03 Added:  TJDbEnumCombo, like TDbComboBox but, uses itemindex instead of text
 2012-09-20 Added:  TJLabeledIntegerEdit and TJLabeledFloatEdit property CurrentValue
 2012-06-12 Fixed:  TJDbGridTimeCtrl, store time value
diff --git a/components/jujiboutils/src/jdbgridutils.pas b/components/jujiboutils/src/jdbgridutils.pas
index fcfb27071..8b56ba2b5 100644
--- a/components/jujiboutils/src/jdbgridutils.pas
+++ b/components/jujiboutils/src/jdbgridutils.pas
@@ -267,6 +267,7 @@ end;
 
 function TJDbGridStringCtrl.CanDefocus: boolean;
 begin
+  CellEditor.Visible := False;
   Result := True;
 end;
 
@@ -458,7 +459,9 @@ begin
   else
     Result := True;
   if not Result then
-    ShowMessage(Format(SInvalidDateTime, [CellEditor.Text]));
+    ShowMessage(Format(SInvalidDateTime, [CellEditor.Text]))
+  else
+    CellEditor.Visible := False;
 end;
 
 { TJDbGridTimeCtrl }
@@ -646,7 +649,9 @@ begin
   else
     Result := True;
   if not Result then
-    ShowMessage(Format(SInvalidTime, [CellEditor.Text]));
+    ShowMessage(Format(SInvalidTime, [CellEditor.Text]))
+  else
+    CellEditor.Visible := False;
 end;
 
 { TJDbGridDateCtrl }
@@ -835,7 +840,9 @@ begin
   else
     Result := True;
   if not Result then
-    ShowMessage(Format(SInvalidDate, [CellEditor.Text]));
+    ShowMessage(Format(SInvalidDate, [CellEditor.Text]))
+  else
+    CellEditor.Visible := False;
 end;
 
 { TJDbGridDoubleCtrl }
@@ -991,7 +998,9 @@ begin
   else
     Result := True;
   if not Result then
-    ShowMessage(Format(SInvalidNumber, [CellEditor.Text]));
+    ShowMessage(Format(SInvalidNumber, [CellEditor.Text]))
+  else
+    CellEditor.Visible := False;
 end;
 
 { TJDbGridIntegerCtrl }
@@ -1116,7 +1125,9 @@ begin
   else
     Result := True;
   if not Result then
-    ShowMessage(Format(SInvalidNumber, [CellEditor.Text]));
+    ShowMessage(Format(SInvalidNumber, [CellEditor.Text]))
+  else
+    CellEditor.Visible := False;
 end;
 
 end.