diff --git a/ChangeLog b/ChangeLog
index e5cb1daca..859f2405e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-28 Eric Wasylishen <ewasylishen@gmail.com>
+
+	* Source/NSButtonCell.m -isOpaque: Return NO if the button cell has a
+	bezel style set. This is consistent with OS X, and fixes drawing
+	glitches seen in the GSTest NSButton test.
+
 2010-01-28 Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Headers/AppKit/NSButtonCell.h: Correct a typo:
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index ba1451f45..5268caa95 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -624,11 +624,13 @@ typedef struct _GSButtonCellFlags
 }
 
 /**<p>Returns whether the NSButtonCell is opaque. Returns YES if the button 
-   cell is not transparent and if the cell is bordered. NO otherwise</p>
+   cell is not transparent and if the cell is bordered and if there is no
+   bezel style, NO otherwise</p>
  */
 - (BOOL) isOpaque
 {
-  return !_buttoncell_is_transparent && _cell.is_bordered;
+  return !_buttoncell_is_transparent && _cell.is_bordered &&
+    _bezel_style == 0;
 }
 
 - (NSBezelStyle) bezelStyle