diff --git a/AppKit/CPTabView.j b/AppKit/CPTabView.j
index c2b653b30..e0cabcff1 100644
--- a/AppKit/CPTabView.j
+++ b/AppKit/CPTabView.j
@@ -85,6 +85,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 
     [self _updateItems];
     [self _repositionTabs];
+    
+    [aTabViewItem _setTabView:self];
 
     if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
         [_delegate tabViewDidChangeNumberOfTabViewItems:self];
@@ -108,6 +110,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 
     [self _updateItems];
     [self _repositionTabs];
+    
+    [aTabViewItem _setTabView:nil];
 
     if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
         [_delegate tabViewDidChangeNumberOfTabViewItems:self];