diff --git a/macosx/BarButton.m b/macosx/BarButton.m
index 2a583aa08..abd707172 100644
--- a/macosx/BarButton.m
+++ b/macosx/BarButton.m
@@ -58,6 +58,9 @@
         [[NSColor colorWithCalibratedWhite: 0.0 alpha: 0.6] set];
         [rect fill];
         [fButtonDown unlockFocus];
+        
+        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resetBounds:)
+                    name: NSViewBoundsDidChangeNotification object: nil];
 	}
 	return self;
 }
@@ -155,4 +158,9 @@
     [self setImage: fEnabled ? fButtonIn : fButtonNormal];
 }
 
+- (void) resetBounds: (NSNotification *) notification
+{
+    [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO];
+}
+
 @end