diff --git a/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.m b/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.m
index e782b0a03c..08f2487511 100644
--- a/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.m
+++ b/src/MacVim/PSMTabBarControl/source/PSMTabBarControl.m
@@ -476,9 +476,11 @@ - (void)removeTabForCell:(PSMTabBarCell *)cell
     [[NSNotificationCenter defaultCenter] removeObserver:cell];
     if([cell closeButtonTrackingTag] != 0){
         [self removeTrackingRect:[cell closeButtonTrackingTag]];
+        [cell setCloseButtonTrackingTag:0];
     }
     if([cell cellTrackingTag] != 0){
         [self removeTrackingRect:[cell cellTrackingTag]];
+        [cell setCellTrackingTag:0];
     }
 
     // pull from collection
@@ -665,9 +667,11 @@ - (void)update
         [[NSNotificationCenter defaultCenter] removeObserver:cell];
         if([cell closeButtonTrackingTag] != 0){
             [self removeTrackingRect:[cell closeButtonTrackingTag]];
+            [cell setCloseButtonTrackingTag:0];
         }
         if([cell cellTrackingTag] != 0){
             [self removeTrackingRect:[cell cellTrackingTag]];
+            [cell setCellTrackingTag:0];
         }
     }