diff --git a/macosx/BarButton.h b/macosx/BarButton.h
index 2e12bffe8..6bc3eb114 100644
--- a/macosx/BarButton.h
+++ b/macosx/BarButton.h
@@ -37,4 +37,6 @@
 - (void) setText: (NSString *) text;
 - (void) setEnabled: (BOOL) enable;
 
+- (void) resetBounds: (NSNotification *) notification;
+
 @end
diff --git a/macosx/BarButton.m b/macosx/BarButton.m
index 44ada31a7..cd7979078 100644
--- a/macosx/BarButton.m
+++ b/macosx/BarButton.m
@@ -162,7 +162,7 @@
 - (void) resetBounds: (NSNotification *) notification
 {
     [self removeTrackingRect: fTrackingTag];
-    [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO];
+    fTrackingTag = [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO];
 }
 
 @end
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 293745a5f..ddd75ad76 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1522,6 +1522,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) toggleFilterBar: (id) sender