diff --git a/ChangeLog b/ChangeLog
index 55df3c706..88e3212c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-24 Riccardo Mottola <rmottola@users.sf.net>
+
+	* Source/NSBrowser.m,
+	* Source/NSMatrix.m: use controlColor for the background to match
+	Cocoa behaviour.
+
 2010-02-22  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSButtonCell.m (-setImagePosition): Never call NSCell's
diff --git a/Source/NSBrowser.m b/Source/NSBrowser.m
index d271ddb74..9c211ab0b 100644
--- a/Source/NSBrowser.m
+++ b/Source/NSBrowser.m
@@ -3076,10 +3076,8 @@ static NSTextFieldCell *titleCell;
       [matrix setAutoscroll: YES];
 
       // Set up background colors.
-      [matrix setBackgroundColor: [NSColor controlBackgroundColor]];
+      [matrix setBackgroundColor: [NSColor controlColor]];
       [matrix setDrawsBackground: YES];
-      [matrix setCellBackgroundColor: [NSColor controlBackgroundColor]];
-      [matrix setDrawsCellBackground: YES];
 
       if (!_allowsMultipleSelection)
         {
diff --git a/Source/NSMatrix.m b/Source/NSMatrix.m
index 9e6b6acec..7f9303975 100644
--- a/Source/NSMatrix.m
+++ b/Source/NSMatrix.m
@@ -311,9 +311,9 @@ static SEL getSel;
   [self setFrame: frameRect];
 
   _tabKeyTraversesCells = YES;
-  [self setBackgroundColor: [NSColor controlBackgroundColor]];
+  [self setBackgroundColor: [NSColor controlColor]];
   [self setDrawsBackground: NO];
-  [self setCellBackgroundColor: [NSColor controlBackgroundColor]];
+  [self setCellBackgroundColor: [NSColor controlColor]];
   [self setDrawsCellBackground: NO];
   [self setSelectionByRect: YES];
   _dottedRow = _dottedColumn = -1;