 		
 		let nextAllowed = dateRange.next().restrictToDates(minDate, maxDate).endDate != dateRange.endDate
 		segmentedControl.setEnabled(nextAllowed, forSegment: 2)
+		
+		// Display the middle segment as selected while the expanded date range popover is being shown.
+		(segmentedControl.cell as? NSSegmentedCell)?.trackingMode = dateRangePickerController != nil ? .SelectOne : .Momentary
+		segmentedControl.selectedSegment = dateRangePickerController != nil ? 1 : -1
 	}
 	
 	// MARK: - ExpandedDateRangePickerControllerDelegate

		segmentedControl.setLabel("▶", forSegment: 2)
		segmentedControl.action = "segmentDidChange:"
		segmentedControl.autoresizingMask = [.ViewNotSizable]
		(segmentedControl.cell as? NSSegmentedCell)?.trackingMode = .Momentary
		segmentedControl.target = self
		self.addSubview(segmentedControl)
		

			popover.contentViewController = dateRangePickerController
			popover.delegate = self
			popover.showRelativeToRect(self.bounds, ofView: self, preferredEdge: .MinY)
			updateSegmentedControl()
		case 2:
			dateRange = dateRange.next()
		default:
