diff --git a/AppKit/CPSegmentedControl.j b/AppKit/CPSegmentedControl.j
index fca46a536..cb2c025c5 100644
--- a/AppKit/CPSegmentedControl.j
+++ b/AppKit/CPSegmentedControl.j
@@ -180,7 +180,11 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     var count = [self segmentCount];
 
-    if (_selectedSegment >= count)
+    if (count == 0)
+        _selectedSegment = -1;
+    else if (_selectedSegment < 0)
+        [self setSelectedSegment:0];
+    else if (_selectedSegment >= count)
         [self setSelectedSegment:count - 1];
 }