diff --git a/jvcl/run/JvDBGrid.pas b/jvcl/run/JvDBGrid.pas
index 6ab66d6716..dea5d2e8d7 100644
--- a/jvcl/run/JvDBGrid.pas
+++ b/jvcl/run/JvDBGrid.pas
@@ -19,7 +19,7 @@
   Polaris Software
   Lionel Reynaud
   Flemming Brandt Clausen
-  Frédéric Leneuf-Magaud
+  Frédéric Leneuf-Magaud
   Andreas Hausladen
   Ronald Hoek
 
@@ -51,7 +51,7 @@
   a gap after the last column). This bug comes from DBGrid.pas.
 
 -----------------------------------------------------------------------------
-2004/07/08 - WPostma merged changes by Frédéric Leneuf-Magaud and ahuser.}
+2004/07/08 - WPostma merged changes by Frédéric Leneuf-Magaud and ahuser.}
 
 // $Id$
 
@@ -3842,7 +3842,10 @@ procedure TJvDBGrid.DrawColumnCell(const Rect: TRect; DataCol: Integer;
     begin
       Bmp := GetGridBitmap(TGridPicture(I));
       if Highlight then
-        DrawThemedHighlighting(Canvas, Rect)
+      begin
+        if not DrawThemedHighlighting(Canvas, Rect) then
+          Canvas.FillRect(Rect);
+      end
       else
         Canvas.FillRect(Rect);
       DrawBitmapTransparent(Canvas, (Rect.Left + Rect.Right + 1 - Bmp.Width) div 2,