diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2cc0db397a..5122a7d856 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-09-12 13:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/hbgtcore.c
+    * changed default UNSELECTED collor from W/N to N/W
+
 2007-09-12 12:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * source/rtl/teditor.prg
    * source/rtl/tbrowse.prg
diff --git a/harbour/source/rtl/hbgtcore.c b/harbour/source/rtl/hbgtcore.c
index e1259be292..f0d94e616f 100644
--- a/harbour/source/rtl/hbgtcore.c
+++ b/harbour/source/rtl/hbgtcore.c
@@ -432,7 +432,7 @@ static void hb_gt_def_StringToColors( const char * szColorString, int ** pColors
       pColors[ HB_CLR_ENHANCED   ] = 0x70;
       pColors[ HB_CLR_BORDER     ] = 0;
       pColors[ HB_CLR_BACKGROUND ] = 0;
-      pColors[ HB_CLR_UNSELECTED ] = 0x07;
+      pColors[ HB_CLR_UNSELECTED ] = 0x70;
    }
    else do
    {
@@ -448,9 +448,9 @@ static void hb_gt_def_StringToColors( const char * szColorString, int ** pColors
    }
    while( szColorString );
 
-   if( nPos >= 1 && nPos <= 3 )
+   if( nPos >= HB_CLR_ENHANCED && nPos < HB_CLR_UNSELECTED &&
+       *piColorCount > HB_CLR_UNSELECTED )
       pColors[ HB_CLR_UNSELECTED ] = pColors[ HB_CLR_ENHANCED ];
-   
 }
 
 static void hb_gt_def_ColorsToString( int * pColors, int iColorCount, char * pszColorString, int iBufSize )