diff --git a/ChangeLog b/ChangeLog
index 05463c480..9bf01b8a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-18  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/GSStandardWindowDecorationView.m: Use bounds rect instead
+	of frame rect when laying out the window parts (title bar, etc).
+
 2011-04-18 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/GSXibLoader.m: Rewrote the handling of the data
diff --git a/Source/GSStandardWindowDecorationView.m b/Source/GSStandardWindowDecorationView.m
index 4442e43d7..dec8e9a0a 100644
--- a/Source/GSStandardWindowDecorationView.m
+++ b/Source/GSStandardWindowDecorationView.m
@@ -99,24 +99,24 @@
     {
       float titleHeight = [theme titlebarHeight];
 
-      titleBarRect = NSMakeRect(0.0, _frame.size.height - titleHeight,
-	_frame.size.width, titleHeight);
+      titleBarRect = NSMakeRect(0.0, [self bounds].size.height - titleHeight,
+	[self bounds].size.width, titleHeight);
     }
   if (hasResizeBar)
     {
-      resizeBarRect = NSMakeRect(0.0, 0.0, _frame.size.width, [theme resizebarHeight]);
+      resizeBarRect = NSMakeRect(0.0, 0.0, [self bounds].size.width, [theme resizebarHeight]);
     }
   if (hasCloseButton)
     {
       closeButtonRect = NSMakeRect(
-	_frame.size.width - 15 - 4, _frame.size.height - 15 - 4, 15, 15);
+	[self bounds].size.width - 15 - 4, [self bounds].size.height - 15 - 4, 15, 15);
       [closeButton setFrame: closeButtonRect];
     }
 
   if (hasMiniaturizeButton)
     {
       miniaturizeButtonRect = NSMakeRect(
-	4, _frame.size.height - 15 - 4, 15, 15);
+	4, [self bounds].size.height - 15 - 4, 15, 15);
       [miniaturizeButton setFrame: miniaturizeButtonRect];
     }
 }
@@ -180,7 +180,7 @@
 - (void) drawRect: (NSRect)rect
 {
   [[GSTheme theme] drawWindowBorder: rect
-                   withFrame: _frame 
+                   withFrame: [self bounds] 
                    forStyleMask: [window styleMask]
                    state: inputState
                    andTitle: [window title]];