diff --git a/ChangeLog b/ChangeLog
index 8d92fe871c..47e8555ad0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-04  Simon Budig  <simon@gimp.org>
+
+	* plug-ins/common/grid.c: changed the default colors for the
+	first invocation to the current foregroud color which is more
+	likely to be useful than the blue shades.
+
 2004-08-04  Sven Neumann  <sven@gimp.org>
 
 	* themes/Default/images/Makefile.am
diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c
index 4b9386deaf..9d2f53151f 100644
--- a/plug-ins/common/grid.c
+++ b/plug-ins/common/grid.c
@@ -106,9 +106,9 @@ typedef struct
 
 Config grid_cfg =
 {
-  1, 16, 8, { 0.0, 0.0, 0.5, 1.0 },    /* horizontal   */
-  1, 16, 8, { 0.0, 0.0, 0.5, 1.0 },    /* vertical     */
-  0,  2, 6, { 0.0, 0.0, 1.0, 1.0 },    /* intersection */
+  1, 16, 8, { 0.0, 0.0, 0.0, 1.0 },    /* horizontal   */
+  1, 16, 8, { 0.0, 0.0, 0.0, 1.0 },    /* vertical     */
+  0,  2, 6, { 0.0, 0.0, 0.0, 1.0 },    /* intersection */
 };
 
 
@@ -218,6 +218,9 @@ run (const gchar      *name,
     }
   else
     {
+      gimp_palette_get_foreground (&grid_cfg.hcolor);
+      grid_cfg.vcolor = grid_cfg.icolor = grid_cfg.hcolor;
+
       /*  Possibly retrieve data  */
       gimp_get_data ("plug_in_grid", &grid_cfg);
     }