diff --git a/ChangeLog b/ChangeLog
index 7f6617ec3..6aa63f32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-11 Quentin Mathe <quentin.mathe@gmail.com>
+
+	* Source/NSOutlineView.m (-editColumn:row:withEvent:select:): Fixed broken 
+	cell editability by replicating NSTableView changes r25091.
+
 2010-01-06 Fred Kiefer <FredKiefer@gmx.de>
 
 	* TextConverters/RTF/RTFConsumer.m (RTFDConsumer-appendImage:):
diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m
index 240fb10c0..bee0d7775 100644
--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@@ -1412,7 +1412,6 @@ Also returns the child index relative to this parent. */
   [self _autoloadExpandedItems];
 }
 
-
 - (void) editColumn: (int) columnIndex
                 row: (int) rowIndex
           withEvent: (NSEvent *) theEvent
@@ -1472,16 +1471,6 @@ Also returns the child index relative to this parent. */
   [_editedCell setObjectValue: [self _objectValueForTableColumn: tb
                                      row: rowIndex]];
 
-  // We really want the correct background color!
-  if ([_editedCell respondsToSelector: @selector(setBackgroundColor:)])
-    {
-      [(NSTextFieldCell *)_editedCell setBackgroundColor: _backgroundColor];
-    }
-  else
-    {
-      [t setBackgroundColor: _backgroundColor];
-    }
-
   // But of course the delegate can mess it up if it wants
   [self _willDisplayCell: _editedCell
         forTableColumn: tb
@@ -1503,6 +1492,9 @@ Also returns the child index relative to this parent. */
     }
 
   _textObject = [_editedCell setUpFieldEditorAttributes: t];
+  // FIXME: Which background color do we want here?
+  [_textObject setBackgroundColor: [NSColor selectedControlColor]];
+  [_textObject setDrawsBackground: YES];
 
   drawingRect = [self frameOfCellAtColumn: columnIndex  row: rowIndex];