diff --git a/ChangeLog b/ChangeLog
index 1f24ce02a..f5e5dd48c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-27 10:07-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSNibCompatibility.m: Corrected issue with using generic
+	cells on some controls.
+
 2008-11-27 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* NSSound.m:
diff --git a/Source/GSNibCompatibility.m b/Source/GSNibCompatibility.m
index 9aad968f6..e52addb07 100644
--- a/Source/GSNibCompatibility.m
+++ b/Source/GSNibCompatibility.m
@@ -1003,7 +1003,10 @@ static BOOL _isInInterfaceBuilder = NO;
       [_className isEqualToString: _originalClassName] == NO)
     {
       Class newCellClass = [newClass cellClass];
-      result = [[newCellClass alloc] initWithCoder: coder];      
+      if(newCellClass != [NSCell class])
+	{
+	  result = [[newCellClass alloc] initWithCoder: coder];      
+	}
     }
 
   return result;