diff --git a/AppKit/CPTabView.j b/AppKit/CPTabView.j
index 12899624b..822619650 100644
--- a/AppKit/CPTabView.j
+++ b/AppKit/CPTabView.j
@@ -789,7 +789,13 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
         var idx = [self indexOfTabViewItem:_selectedTabViewItem];
 
         if (idx !== CPNotFound)
+        {
+            // Temporarily set the selected item to not selected.
+            // It allows the initial selection to be made correctly.
+            _selectedTabViewItem = nil;
+
             [self selectTabViewItemAtIndex:idx];
+        }
     }
 
     var type = _type;