diff --git a/macosx/BarButton.m b/macosx/BarButton.m
index b11330e84..e68e00cc9 100644
--- a/macosx/BarButton.m
+++ b/macosx/BarButton.m
@@ -32,6 +32,7 @@
 	if ((self = [super initWithCoder: coder]))
     {
         fEnabled = NO;
+        fTrackingTag = 0;
         
         NSSize buttonSize = [self frame].size;
         fButtonNormal = [[NSImage alloc] initWithSize: buttonSize];
@@ -104,11 +105,6 @@
 	return self;
 }
 
-- (void) awakeFromNib
-{
-    fTrackingTag = [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO];
-}
-
 - (void) dealloc
 {
     [fButtonNormal release];
@@ -206,7 +202,8 @@
 
 - (void) resetBounds: (NSNotification *) notification
 {
-    [self removeTrackingRect: fTrackingTag];
+    if (fTrackingTag)
+        [self removeTrackingRect: fTrackingTag];
     fTrackingTag = [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO];
 }
 
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 625aaf904..6f1fbc290 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1571,6 +1571,12 @@ static void sleepCallBack(void * controller, io_service_t y,
     NSSize minSize = [fWindow contentMinSize];
     minSize.height += heightChange;
     [fWindow setContentMinSize: minSize];
+    
+    //reset tracking rects for filter buttons
+    [fNoFilterButton resetBounds: nil];
+    [fSeedFilterButton resetBounds: nil];
+    [fDownloadFilterButton resetBounds: nil];
+    [fPauseFilterButton resetBounds: nil];
 }
 
 - (void) toggleAdvancedBar: (id) sender